]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 14 May 2013 07:41:38 +0000 (09:41 +0200)
committerAnatol Belski <ab@php.net>
Tue, 14 May 2013 07:41:38 +0000 (09:41 +0200)
* PHP-5.4:
  Fixed bug #64830 mimetype detection segfaults on mp3 file


Trivial merge