]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 10 Dec 2013 15:09:41 +0000 (16:09 +0100)
committerRemi Collet <remi@php.net>
Tue, 10 Dec 2013 15:09:41 +0000 (16:09 +0100)
commit9f4d1ee51c19c50a60284a5687f247785fd26f6a
treeea80b67a7be5e05bd4086f5afd67a3bcc2483f59
parent552e8b2b4c5708cb90faf148bd99e3f67fa926b5
parent3e963f8eb44863ef3d758eabe791190b0fd7bb9a
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #66218 zend_register_functions breaks reflection
Zend/zend_builtin_functions.c
ext/reflection/php_reflection.c