]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorMatteo Beccati <mbeccati@php.net>
Mon, 9 Jun 2014 05:07:07 +0000 (07:07 +0200)
committerMatteo Beccati <mbeccati@php.net>
Mon, 9 Jun 2014 05:07:07 +0000 (07:07 +0200)
* PHP-5.4:
  Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191


Trivial merge