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


Trivial merge