Merge branch 'PHP-7.1'

author Bob Weinand <bobwei9@hotmail.com>

Sat, 3 Dec 2016 17:29:11 +0000 (18:29 +0100)

committer Bob Weinand <bobwei9@hotmail.com>

Sat, 3 Dec 2016 17:29:11 +0000 (18:29 +0100)
author Bob Weinand <bobwei9@hotmail.com>
Sat, 3 Dec 2016 17:29:11 +0000 (18:29 +0100)
committer Bob Weinand <bobwei9@hotmail.com>
Sat, 3 Dec 2016 17:29:11 +0000 (18:29 +0100)
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Bob Weinand <bobwei9@hotmail.com>
	Sat, 3 Dec 2016 17:29:11 +0000 (18:29 +0100)
committer	Bob Weinand <bobwei9@hotmail.com>
	Sat, 3 Dec 2016 17:29:11 +0000 (18:29 +0100)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history