]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b157e05 c737b89)
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)
* PHP-5.4:
  Fixed external entity loading


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.