]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Mon, 31 Mar 2014 14:57:39 +0000 (16:57 +0200)
committerRemi Collet <remi@php.net>
Mon, 31 Mar 2014 14:57:39 +0000 (16:57 +0200)
commit62305edc5b35fbb5cd9d194a7d50c6c749eea26d
treeab8644b1287f8ad489bc0631af65c654dbc15d1e
parent5f54cecde99e55ed58206f6100df84c2cac264be
parent60fb57d4f672d08b8aaa39469c4eba92af08265b
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
ext/fileinfo/libmagic/apprentice.c