From: Anatol Belski <ab@php.net>
Date: Sat, 25 Oct 2014 10:04:27 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.3RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3794431b7818cb1a8ed1464dd89428ea8011cee2;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

3794431b7818cb1a8ed1464dd89428ea8011cee2