Merge branch 'PHP-7.0'

author Xinchen Hui <laruence@gmail.com>

Tue, 29 Mar 2016 09:14:48 +0000 (17:14 +0800)

committer Xinchen Hui <laruence@gmail.com>

Tue, 29 Mar 2016 09:14:48 +0000 (17:14 +0800)
author Xinchen Hui <laruence@gmail.com>
Tue, 29 Mar 2016 09:14:48 +0000 (17:14 +0800)
committer Xinchen Hui <laruence@gmail.com>
Tue, 29 Mar 2016 09:14:48 +0000 (17:14 +0800)
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Xinchen Hui <laruence@gmail.com>
	Tue, 29 Mar 2016 09:14:48 +0000 (17:14 +0800)
committer	Xinchen Hui <laruence@gmail.com>
	Tue, 29 Mar 2016 09:14:48 +0000 (17:14 +0800)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history