From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 20 Feb 2013 18:30:59 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20c623c9be2ad9c408b991e805780ac1fc5493e8;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed external entity loading
---

20c623c9be2ad9c408b991e805780ac1fc5493e8