]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:05:44 +0000 (14:05 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:05:44 +0000 (14:05 +0200)
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size


Trivial merge