]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Tue, 25 Jun 2013 20:23:25 +0000 (13:23 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 25 Jun 2013 20:23:25 +0000 (13:23 -0700)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  - BFN
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana


Trivial merge