]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sat, 25 Oct 2014 10:05:34 +0000 (12:05 +0200)
committerAnatol Belski <ab@php.net>
Sat, 25 Oct 2014 10:05:34 +0000 (12:05 +0200)
* PHP-5.6:
  updated libmagic.patch in 5.6
  updated libmagic.patch in 5.5


Trivial merge