From: Anatol Belski <ab@php.net>
Date: Tue, 14 May 2013 07:42:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~442^2~86^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f2e0cb8f5b35b457f5f949f5ddd71de8e1352c1;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  updated NEWS
  Fixed bug #64830 mimetype detection segfaults on mp3 file
---

1f2e0cb8f5b35b457f5f949f5ddd71de8e1352c1