]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sat, 30 Aug 2014 02:05:42 +0000 (04:05 +0200)
committerAnatol Belski <ab@php.net>
Sat, 30 Aug 2014 02:05:42 +0000 (04:05 +0200)
* PHP-5.6:
  Fixed bug #67731 finfo::file() returns invalid mime type for binary files

1  2 
ext/fileinfo/libmagic/funcs.c

Simple merge