]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 18:16:29 +0000 (20:16 +0200)
committerAnatol Belski <ab@php.net>
Thu, 24 Apr 2014 18:16:29 +0000 (20:16 +0200)
* PHP-5.6:
  updated libmagic.patch for 5.6+
  updated libmagic.patch


Trivial merge