From: Anatol Belski <ab@php.net>
Date: Tue, 27 May 2014 20:40:17 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~256
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=412feff4be28565b8d8340002edcad8ed132d6d9;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libmagic.patch for 5.6+
  updated libmagic.patch for 5.4+
---

412feff4be28565b8d8340002edcad8ed132d6d9