]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 22 Jan 2015 11:28:11 +0000 (12:28 +0100)
committerAnatol Belski <ab@php.net>
Thu, 22 Jan 2015 11:28:11 +0000 (12:28 +0100)
* PHP-5.6:
  Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs


Trivial merge