summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-01-04 17:04:53 +0100
committerAnatol Belski <ab@php.net>2015-01-04 17:04:53 +0100
commitc77226131924e11eb0ab098af42feae5873b147a (patch)
tree01b4cf551180ffbcd7934d77f4ef645fe793f5fb
parentd3f171117c6913e849df004a927dd4915c64124c (diff)
parentebb98e7aeb4c01f79f36556443c63d57824e4b80 (diff)
downloadphp-git-c77226131924e11eb0ab098af42feae5873b147a.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: updated libmagic.patch in 5.4
0 files changed, 0 insertions, 0 deletions