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


Trivial merge