]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Sun, 4 Jan 2015 16:04:53 +0000 (17:04 +0100)
committerAnatol Belski <ab@php.net>
Sun, 4 Jan 2015 16:04:53 +0000 (17:04 +0100)
* PHP-5.4:
  updated libmagic.patch in 5.4


Trivial merge