]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorMatteo Beccati <mbeccati@php.net>
Mon, 9 Jun 2014 05:07:17 +0000 (07:07 +0200)
committerMatteo Beccati <mbeccati@php.net>
Mon, 9 Jun 2014 05:07:17 +0000 (07:07 +0200)
commit6eaadc022818e22e204c0c52abf39134ee4b4612
tree1ac3c23aa328d7d576509ca5ac2d4c361f4fb68a
parentdf03bcf1352a4a0494a6a6d096de3c0eccbf7565
parentaf5057bea7b6298e81621c7c0372028d2fc73037
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191