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


Trivial merge