]> 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:24:07 +0000 (14:24 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:24:07 +0000 (14:24 +0200)
commit9ee147e6ff970e317b2743b6679dbaca7c875b65
treeba633fa2190b882e986803b6d4cc1c6ee3137991
parentb999947dcd698852eca474b5306ce18cea63226d
parent20b03c84ec0d66a017a06f3c1fcbf8ffdf62c1a7
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Bug #67412  fileinfo: cdf_count_chain insufficient boundary check
ext/fileinfo/libmagic/cdf.c