]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 18 Feb 2014 12:57:10 +0000 (13:57 +0100)
committerRemi Collet <remi@php.net>
Tue, 18 Feb 2014 12:57:10 +0000 (13:57 +0100)
* PHP-5.4:
  NEWS
  Fixed Bug #66731 file: infinite recursion


Trivial merge