]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Tue, 10 Dec 2013 19:34:45 +0000 (11:34 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 10 Dec 2013 19:34:45 +0000 (11:34 -0800)
* 'PHP-5.4' of git.php.net:php-src:
  Fixed Bug #66218 zend_register_functions breaks reflection


Trivial merge