]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorScott MacVicar <scottmac@php.net>
Mon, 6 Jan 2014 17:05:16 +0000 (17:05 +0000)
committerScott MacVicar <scottmac@php.net>
Mon, 6 Jan 2014 17:05:16 +0000 (17:05 +0000)
commit42f084c692bca98e3129bddb3b6b0d213eff12e8
tree599e567c4900ca0e7ad1010a8d2680c5735ecbc9
parent748e707bf94cf3353616727ade7c3a79ef5de25f
parent24cc7c0be27f9da8162a6f0827a724aca60b099b
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  [libxml] Unit test for libxml_disable_entity_loader()