]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 20 Feb 2014 18:01:09 +0000 (19:01 +0100)
committerAnatol Belski <ab@php.net>
Thu, 20 Feb 2014 18:01:09 +0000 (19:01 +0100)
* PHP-5.5:
  updated libmagic.patch in 5.4/5


Trivial merge