]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Wed, 20 Feb 2013 18:31:52 +0000 (22:31 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 20 Feb 2013 18:31:52 +0000 (22:31 +0400)
* PHP-5.5:
  Fixed external entity loading


Trivial merge