From: Scott MacVicar <scottmac@php.net>
Date: Mon, 6 Jan 2014 17:05:16 +0000 (+0000)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: PRE_PHPNG_MERGE~353^2~62^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42f084c692bca98e3129bddb3b6b0d213eff12e8;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

42f084c692bca98e3129bddb3b6b0d213eff12e8