]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Thu, 7 Feb 2013 12:09:49 +0000 (16:09 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 7 Feb 2013 12:09:49 +0000 (16:09 +0400)
commit0547a36e95ec36025a30e93e971d26b6b1ecf0e9
tree8770b0319530b367666c571b890bf85f2e5e84c6
parent4730bc86801e593b8e910e3dce30e32cd758adee
parent1a18e84822cf7d9196961052e38cde9404de86e7
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Disabled external entities loading