]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Thu, 29 Aug 2013 07:57:19 +0000 (11:57 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 29 Aug 2013 07:57:19 +0000 (11:57 +0400)
* PHP-5.5:
  Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)

Conflicts:
NEWS

1  2 
ext/opcache/Optimizer/pass1_5.c

Simple merge