]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  [libxml] Unit test for libxml_disable_entity_loader()


Trivial merge