]> granicus.if.org Git - php/commit
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)
commit933e01bbac894c219a56db9f378c60c0c93f3ca2
tree44bfba3479ae29af0dbee5e5bb8be8f2e5369398
parente191cb63ba9a32c527263b3913e2f4e5d6dd8aa3
parent74555e7c26b2c61bb8e67b7d6a6f4d2b8eb3a5f3
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64830 mimetype detection segfaults on mp3 file