From: Anatol Belski <ab@php.net>
Date: Tue, 14 May 2013 09:16:01 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC2~21^2~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75ee1a6113600f3f09945a52a56417b33f454fe3;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch after fix for #64830
---

75ee1a6113600f3f09945a52a56417b33f454fe3