]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c0f032 4ed2618)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Sun, 4 Jan 2015 16:06:15 +0000 (17:06 +0100)
committerAnatol Belski <ab@php.net>
Sun, 4 Jan 2015 16:06:15 +0000 (17:06 +0100)
* PHP-5.5:
  updated libmagic.patch in 5.5
  updated libmagic.patch in 5.4


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.