]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 18 Feb 2014 18:08:45 +0000 (19:08 +0100)
committerAnatol Belski <ab@php.net>
Tue, 18 Feb 2014 18:08:45 +0000 (19:08 +0100)
commit8dd99dd2dc748b323f18619fa7bfa940e8d4dd9a
treeba316754ae3c00e21664a708983fac4901e58509
parent1cc5d1009f47db51826ac999ce6c50e56172d11c
parenta289b37f48f730bbb46159f2fab2bbc95d4c7d64
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch