Merge branch 'PHP-7.0' into PHP-7.1

author Nikita Popov <nikic@php.net>

Wed, 28 Sep 2016 21:22:48 +0000 (23:22 +0200)

committer Nikita Popov <nikic@php.net>

Wed, 28 Sep 2016 21:22:48 +0000 (23:22 +0200)
author Nikita Popov <nikic@php.net>
Wed, 28 Sep 2016 21:22:48 +0000 (23:22 +0200)
committer Nikita Popov <nikic@php.net>
Wed, 28 Sep 2016 21:22:48 +0000 (23:22 +0200)
diff --cc Zend/zend_ast.c
Simple merge
diff --cc Zend/zend_compile.c
Simple merge
author	Nikita Popov <nikic@php.net>
	Wed, 28 Sep 2016 21:22:48 +0000 (23:22 +0200)
committer	Nikita Popov <nikic@php.net>
	Wed, 28 Sep 2016 21:22:48 +0000 (23:22 +0200)
		1	2
Zend/zend_ast.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_compile.c	patch \|	diff1 \|	diff2 \|	blob \| history