Merge branch 'PHP-7.1'

author Anatol Belski <ab@php.net>

Mon, 21 Nov 2016 21:59:59 +0000 (22:59 +0100)

committer Anatol Belski <ab@php.net>

Mon, 21 Nov 2016 21:59:59 +0000 (22:59 +0100)
author Anatol Belski <ab@php.net>
Mon, 21 Nov 2016 21:59:59 +0000 (22:59 +0100)
committer Anatol Belski <ab@php.net>
Mon, 21 Nov 2016 21:59:59 +0000 (22:59 +0100)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Anatol Belski <ab@php.net>
	Mon, 21 Nov 2016 21:59:59 +0000 (22:59 +0100)
committer	Anatol Belski <ab@php.net>
	Mon, 21 Nov 2016 21:59:59 +0000 (22:59 +0100)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history