]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:05:02 +0000 (14:05 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:05:02 +0000 (14:05 +0200)
commit5e7cb43890cebbd82bf8c951b1db0e9417931f5a
tree7afd2714e0a271c64cb9cd1ec3b9308894974300
parente2493a3a084102db5119cd3402eda0352d88017f
parentda399ce6a8ebea05e80de6c176f479ef5a6961c8
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
ext/fileinfo/libmagic/softmagic.c