]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Mon, 13 Jan 2014 12:16:57 +0000 (16:16 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 13 Jan 2014 12:16:57 +0000 (16:16 +0400)
* PHP-5.6:
  Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)


Trivial merge