]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Tue, 27 May 2014 20:40:17 +0000 (22:40 +0200)
committerAnatol Belski <ab@php.net>
Tue, 27 May 2014 20:40:17 +0000 (22:40 +0200)
* PHP-5.6:
  updated libmagic.patch for 5.6+
  updated libmagic.patch for 5.4+


Trivial merge