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


Trivial merge