]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d440bb3 d02aa44)
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)
* PHP-5.4:
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.