Merge branch 'PHP-7.0' into PHP-7.1

author Remi Collet <remi@php.net>

Fri, 20 Jan 2017 16:46:24 +0000 (17:46 +0100)

committer Remi Collet <remi@php.net>

Fri, 20 Jan 2017 16:46:24 +0000 (17:46 +0100)
author Remi Collet <remi@php.net>
Fri, 20 Jan 2017 16:46:24 +0000 (17:46 +0100)
committer Remi Collet <remi@php.net>
Fri, 20 Jan 2017 16:46:24 +0000 (17:46 +0100)
diff --cc Zend/zend.c
Simple merge
diff --cc Zend/zend.h
Simple merge
diff --cc ext/standard/info.c
Simple merge
author	Remi Collet <remi@php.net>
	Fri, 20 Jan 2017 16:46:24 +0000 (17:46 +0100)
committer	Remi Collet <remi@php.net>
	Fri, 20 Jan 2017 16:46:24 +0000 (17:46 +0100)
		1	2
Zend/zend.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend.h	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/info.c	patch \|	diff1 \|	diff2 \|	blob \| history