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

Merge branch 'PHP-5.5' into PHP-5.6

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

d104f2ea881c0737fe13a20698682d2c8ff86819