summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-30 20:22:08 +0100
committerAnatol Belski <ab@php.net>2014-12-30 20:22:08 +0100
commita0cf63f526211f9ae98386464b8784cad3be7261 (patch)
tree04c8c2966630802fa3c1936f3ee6a27d1138c647
parent85b4a6552029b1f3fdb39251f37986fafcb958a1 (diff)
parent99162b8198b37b5fa434152e472099379bf1f55c (diff)
downloadphp-git-a0cf63f526211f9ae98386464b8784cad3be7261.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: updated libmagic.patch
0 files changed, 0 insertions, 0 deletions