Merge branch 'PHP-7.0' into PHP-7.1

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

Thu, 2 Feb 2017 17:33:26 +0000 (18:33 +0100)

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

Thu, 2 Feb 2017 17:33:42 +0000 (18:33 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Thu, 2 Feb 2017 17:33:26 +0000 (18:33 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Thu, 2 Feb 2017 17:33:42 +0000 (18:33 +0100)
diff --cc NEWS
Simple merge
diff --cc Zend/zend_builtin_functions.c
Simple merge
diff --cc Zend/zend_hash.h
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Thu, 2 Feb 2017 17:33:26 +0000 (18:33 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Thu, 2 Feb 2017 17:33:42 +0000 (18:33 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_builtin_functions.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_hash.h	patch \|	diff1 \|	diff2 \|	blob \| history