]> granicus.if.org Git - php/commit
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)
commitb3c2c2bcb136945d814be20b12fda27992a01769
treebe21e5bd6733e1b65d05baafa1598e5815071561
parent696d286911b8afc438ffef1f207a39ccc95a5617
parentb7b6c35eeaff1d22dc18f81765eea96c3cd6d2b2
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed compatibility with old PHP versions
  Fixed bug #65915 (Inconsistent results with require return value)

Conflicts:
NEWS