]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Wed, 20 Feb 2013 18:30:59 +0000 (22:30 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 20 Feb 2013 18:30:59 +0000 (22:30 +0400)
commit20c623c9be2ad9c408b991e805780ac1fc5493e8
treef7226e2d6059f8a766fba738a8817bfd6690fb9e
parentb157e05f573a2ec3b3344317c6a981f933ff4c9a
parentc737b89473df9dba6742b8fc8fbf6d009bf05c36
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed external entity loading