Merge branch 'PHP-7.0'

author Dmitry Stogov <dmitry@zend.com>

Thu, 10 Mar 2016 10:34:00 +0000 (13:34 +0300)

committer Dmitry Stogov <dmitry@zend.com>

Thu, 10 Mar 2016 10:34:00 +0000 (13:34 +0300)
author Dmitry Stogov <dmitry@zend.com>
Thu, 10 Mar 2016 10:34:00 +0000 (13:34 +0300)
committer Dmitry Stogov <dmitry@zend.com>
Thu, 10 Mar 2016 10:34:00 +0000 (13:34 +0300)
diff --cc Zend/zend_execute.c
Simple merge
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Dmitry Stogov <dmitry@zend.com>
	Thu, 10 Mar 2016 10:34:00 +0000 (13:34 +0300)
committer	Dmitry Stogov <dmitry@zend.com>
	Thu, 10 Mar 2016 10:34:00 +0000 (13:34 +0300)
		1	2
Zend/zend_execute.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history