From: Anatol Belski <ab@php.net>
Date: Sun, 7 Apr 2013 20:18:53 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta3~8^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b12f79cafb40fc8a9a3768cfd6e4d2d9f056d506;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  upgraded libmagic to 5.14
---

b12f79cafb40fc8a9a3768cfd6e4d2d9f056d506