Merge remote-tracking branch 'origin/PHP-7.0'

author Bob Weinand <bobwei9@hotmail.com>

Wed, 20 Apr 2016 23:26:48 +0000 (01:26 +0200)

committer Bob Weinand <bobwei9@hotmail.com>

Wed, 20 Apr 2016 23:26:48 +0000 (01:26 +0200)
author Bob Weinand <bobwei9@hotmail.com>
Wed, 20 Apr 2016 23:26:48 +0000 (01:26 +0200)
committer Bob Weinand <bobwei9@hotmail.com>
Wed, 20 Apr 2016 23:26:48 +0000 (01:26 +0200)
diff --cc Zend/zend_compile.c
Simple merge
diff --cc Zend/zend_compile.h
Simple merge
diff --cc Zend/zend_execute.c
Simple merge
diff --cc Zend/zend_execute.h
Simple merge
author	Bob Weinand <bobwei9@hotmail.com>
	Wed, 20 Apr 2016 23:26:48 +0000 (01:26 +0200)
committer	Bob Weinand <bobwei9@hotmail.com>
	Wed, 20 Apr 2016 23:26:48 +0000 (01:26 +0200)
		1	2
Zend/zend_compile.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_compile.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_execute.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history