]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 696d286 b7b6c35)
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Mon, 25 Nov 2013 10:11:45 +0000 (14:11 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 25 Nov 2013 10:11:45 +0000 (14:11 +0400)
* PHP-5.5:
  Fixed compatibility with old PHP versions
  Fixed bug #65915 (Inconsistent results with require return value)

Conflicts:
NEWS


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