Merge branch 'PHP-7.0'

author Dmitry Stogov <dmitry@zend.com>

Mon, 30 Nov 2015 13:54:37 +0000 (16:54 +0300)

committer Dmitry Stogov <dmitry@zend.com>

Mon, 30 Nov 2015 13:54:37 +0000 (16:54 +0300)
author Dmitry Stogov <dmitry@zend.com>
Mon, 30 Nov 2015 13:54:37 +0000 (16:54 +0300)
committer Dmitry Stogov <dmitry@zend.com>
Mon, 30 Nov 2015 13:54:37 +0000 (16:54 +0300)
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Dmitry Stogov <dmitry@zend.com>
	Mon, 30 Nov 2015 13:54:37 +0000 (16:54 +0300)
committer	Dmitry Stogov <dmitry@zend.com>
	Mon, 30 Nov 2015 13:54:37 +0000 (16:54 +0300)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history