]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 3 Jun 2014 09:09:04 +0000 (11:09 +0200)
committerRemi Collet <remi@php.net>
Tue, 3 Jun 2014 09:09:04 +0000 (11:09 +0200)
* PHP-5.4:
  NEWS
  Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check


Trivial merge