]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:04:36 +0000 (14:04 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:04:36 +0000 (14:04 +0200)
commit18ff81eb1ac4fa5a5eacbf3da04437f128ff7c81
tree384338b266f94cbc53331940665ff84ff17cd63f
parentd440bb3e6854070f3b0a02b0d73b9b06065959af
parentd02aa440909b7a20098ccc9d3820629a36037596
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size