]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 8 Apr 2013 14:24:20 +0000 (16:24 +0200)
committerAnatol Belski <ab@php.net>
Mon, 8 Apr 2013 14:24:20 +0000 (16:24 +0200)
* PHP-5.4:
  updated libmagic.patch


Trivial merge