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


Trivial merge