]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 4 Mar 2014 19:36:08 +0000 (20:36 +0100)
committerRemi Collet <remi@php.net>
Tue, 4 Mar 2014 19:36:08 +0000 (20:36 +0100)
* PHP-5.4:
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo


Trivial merge