]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Tue, 1 Jul 2014 08:28:20 +0000 (10:28 +0200)
committerAnatol Belski <ab@php.net>
Tue, 1 Jul 2014 08:28:20 +0000 (10:28 +0200)
commit48746387b388a881cfcc1ed6c35674fe13ff1d36
treee32e6f42ba3d0c80f88e092359351a3cdb482692
parent2330be5641c907b7edd7cffdd3074e85d0091df5
parent4965d1c2ce8981fcdb21eb6fef185cfec0bb737f
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libmagic.patch