]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.5:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana

1  2 
main/main.c

diff --cc main/main.c
Simple merge