Merge branch 'PHP-7.1'

author Xinchen Hui <laruence@gmail.com>

Fri, 30 Sep 2016 08:01:43 +0000 (16:01 +0800)

committer Xinchen Hui <laruence@gmail.com>

Fri, 30 Sep 2016 08:01:43 +0000 (16:01 +0800)
author Xinchen Hui <laruence@gmail.com>
Fri, 30 Sep 2016 08:01:43 +0000 (16:01 +0800)
committer Xinchen Hui <laruence@gmail.com>
Fri, 30 Sep 2016 08:01:43 +0000 (16:01 +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>
	Fri, 30 Sep 2016 08:01:43 +0000 (16:01 +0800)
committer	Xinchen Hui <laruence@gmail.com>
	Fri, 30 Sep 2016 08:01:43 +0000 (16:01 +0800)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history