]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Thu, 10 Oct 2013 11:33:17 +0000 (15:33 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 10 Oct 2013 11:33:17 +0000 (15:33 +0400)
* PHP-5.5:
  Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).

Conflicts:
NEWS

1  2 
ext/opcache/Optimizer/pass1_5.c
ext/opcache/Optimizer/zend_optimizer.c

Simple merge