]> granicus.if.org Git - php/commit
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)
commit5d0094e5f9f8bd49c615f2ec2542384f802d340d
treeceabc40bbbab1cd63908d82a641b5dc35d163b7f
parenta52258ae175ea49ac03b8aea21d20c36a67c61e2
parent5ae1983b33cc46cb21af278162b4dfdcb2ef4d29
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* '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