]> 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:36:02 +0000 (14:36 +0200)
committerRemi Collet <remi@php.net>
Tue, 10 Jun 2014 12:36:02 +0000 (14:36 +0200)
commit0a7e131128b880ba67ec5ca18409b85336c2874d
tree16d36fafc65ebb0c717bf721cbfee5cc12fe7a99
parentfde5790fd61b5788139df9f052f109139d7d6416
parenta4d709afe2b5345c54c04b095ad8c3fa8afe8b27
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67413  fileinfo: cdf_read_property_info insufficient boundary chec
ext/fileinfo/libmagic/cdf.c