Merge branch 'PHP-7.0' into PHP-7.1

author Stanislav Malyshev <stas@php.net>

Tue, 3 Jan 2017 05:37:06 +0000 (21:37 -0800)

committer Stanislav Malyshev <stas@php.net>

Tue, 3 Jan 2017 05:37:06 +0000 (21:37 -0800)
author Stanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 05:37:06 +0000 (21:37 -0800)
committer Stanislav Malyshev <stas@php.net>
Tue, 3 Jan 2017 05:37:06 +0000 (21:37 -0800)
diff --cc Zend/zend_hash.c
Simple merge
diff --cc ext/wddx/wddx.c
Simple merge
author	Stanislav Malyshev <stas@php.net>
	Tue, 3 Jan 2017 05:37:06 +0000 (21:37 -0800)
committer	Stanislav Malyshev <stas@php.net>
	Tue, 3 Jan 2017 05:37:06 +0000 (21:37 -0800)
		1	2
Zend/zend_hash.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/wddx/wddx.c	patch \|	diff1 \|	diff2 \|	blob \| history