From: Anatol Belski <ab@php.net>
Date: Thu, 24 Apr 2014 18:15:01 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta2~1^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=305c025cdd26fb419565f69b6ad1f17a114c13bc;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

305c025cdd26fb419565f69b6ad1f17a114c13bc