From: Anatol Belski <ab@php.net>
Date: Sun, 4 Jan 2015 16:04:53 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.5RC1~15^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c77226131924e11eb0ab098af42feae5873b147a;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch in 5.4
---

c77226131924e11eb0ab098af42feae5873b147a