From: Anatol Belski <ab@php.net>
Date: Thu, 20 Feb 2014 18:01:09 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0746e6af0861c22773aa414bcf6e59877bb7827d;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libmagic.patch in 5.4/5
---

0746e6af0861c22773aa414bcf6e59877bb7827d