Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Sun, 4 Jan 2015 16:04:53 +0000 (17:04 +0100)
committerAnatol Belski <ab@php.net>
Sun, 4 Jan 2015 16:04:53 +0000 (17:04 +0100)
commitc77226131924e11eb0ab098af42feae5873b147a
tree01b4cf551180ffbcd7934d77f4ef645fe793f5fb
parentd3f171117c6913e849df004a927dd4915c64124c
parentebb98e7aeb4c01f79f36556443c63d57824e4b80
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch in 5.4