]> granicus.if.org Git - php/commit
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)
commit75ee1a6113600f3f09945a52a56417b33f454fe3
tree59167526cca8cd752810beb489fd635ee8317968
parentad210f2c10e07175a39da8ca9b61bd6bf07d6f75
parent1a46a102d96e08d1256770ddca3e9d955bcec025
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch after fix for #64830