From: Anatol Belski <ab@php.net>
Date: Fri, 24 May 2013 22:02:09 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC3~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbdce3b6f6d4267f497289f65ecee462bd25cfda;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

fbdce3b6f6d4267f497289f65ecee462bd25cfda