From: Anatol Belski <ab@php.net>
Date: Mon, 10 Mar 2014 13:13:15 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c17fd651650203a106b904e1cb6f82a3a7a37330;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

c17fd651650203a106b904e1cb6f82a3a7a37330