]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorFelipe Pena <felipensp@gmail.com>
Tue, 25 Jun 2013 19:26:48 +0000 (16:26 -0300)
committerFelipe Pena <felipensp@gmail.com>
Tue, 25 Jun 2013 19:26:48 +0000 (16:26 -0300)
commit5c71d4d785a009d9d962038f80d453e6f042809c
treed48881a2fc011f4c2bdc8ccb618fcce9bee29e0a
parentd99a76ca965dac487b457a6599a4f42ba06ad033
parentd01ca1342c2487d6f825997eeac8aeddac4cf384
Merge branch 'PHP-5.5'

* PHP-5.5:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
main/main.c