From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 7 Feb 2013 12:09:49 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0547a36e95ec36025a30e93e971d26b6b1ecf0e9;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Disabled external entities loading
---

0547a36e95ec36025a30e93e971d26b6b1ecf0e9