Merge branch 'PHP-7.0' into PHP-7.1

author Nikita Popov <nikita.ppv@gmail.com>

Sun, 5 Feb 2017 17:10:04 +0000 (18:10 +0100)

committer Nikita Popov <nikita.ppv@gmail.com>

Sun, 5 Feb 2017 17:10:04 +0000 (18:10 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Sun, 5 Feb 2017 17:10:04 +0000 (18:10 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Sun, 5 Feb 2017 17:10:04 +0000 (18:10 +0100)
diff --cc Zend/Zend.m4
Simple merge
diff --cc configure.in
Simple merge
diff --cc ext/standard/config.m4
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Sun, 5 Feb 2017 17:10:04 +0000 (18:10 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Sun, 5 Feb 2017 17:10:04 +0000 (18:10 +0100)
		1	2
Zend/Zend.m4	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/config.m4	patch \|	diff1 \|	diff2 \|	blob \| history