]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:35:23 +0000 (14:35 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:35:23 +0000 (14:35 +0200)
* PHP-5.4:
  NEWS
  Fixed Bug #67413  fileinfo: cdf_read_property_info insufficient boundary chec


Trivial merge