]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 10 Mar 2014 13:13:15 +0000 (14:13 +0100)
committerAnatol Belski <ab@php.net>
Mon, 10 Mar 2014 13:13:15 +0000 (14:13 +0100)
* PHP-5.4:
  updated libmagic.patch


Trivial merge