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


Trivial merge