From: Anatol Belski <ab@php.net>
Date: Fri, 24 May 2013 22:02:34 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~442^2~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a3828669fce761f93a9fd5bef058b29dd015c95;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64916 finfo testcase contains copyrighted music.
---

3a3828669fce761f93a9fd5bef058b29dd015c95