From: Matteo Beccati <mbeccati@php.net>
Date: Mon, 9 Jun 2014 05:07:17 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~218^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6eaadc022818e22e204c0c52abf39134ee4b4612;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

6eaadc022818e22e204c0c52abf39134ee4b4612