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


Trivial merge