]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Mon, 13 Jan 2014 08:07:50 +0000 (12:07 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 13 Jan 2014 08:07:50 +0000 (12:07 +0400)
commitd09d64c15c282f91ce5af7791d52a8e2d1833aa9
tree5b967f5c4560535260c1ad9375a93f11c0dc305f
parent69edad213aaf595cc4cc75215ac83a813b64121a
parentfcd75690fe68c11ff9a327ee2e1ce3646b032431
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

Conflicts:
NEWS
ext/opcache/Optimizer/block_pass.c