]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 1 Jul 2014 08:27:38 +0000 (10:27 +0200)
committerAnatol Belski <ab@php.net>
Tue, 1 Jul 2014 08:27:38 +0000 (10:27 +0200)
* PHP-5.4:
  updated libmagic.patch


Trivial merge