]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 14 May 2013 09:16:01 +0000 (11:16 +0200)
committerAnatol Belski <ab@php.net>
Tue, 14 May 2013 09:16:01 +0000 (11:16 +0200)
* PHP-5.4:
  updated libmagic.patch after fix for #64830


Trivial merge