Merge branch 'PHP-7.0' into PHP-7.1

author Anatol Belski <ab@php.net>

Fri, 29 Jul 2016 11:07:43 +0000 (13:07 +0200)

committer Anatol Belski <ab@php.net>

Fri, 29 Jul 2016 11:07:43 +0000 (13:07 +0200)
author Anatol Belski <ab@php.net>
Fri, 29 Jul 2016 11:07:43 +0000 (13:07 +0200)
committer Anatol Belski <ab@php.net>
Fri, 29 Jul 2016 11:07:43 +0000 (13:07 +0200)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Anatol Belski <ab@php.net>
	Fri, 29 Jul 2016 11:07:43 +0000 (13:07 +0200)
committer	Anatol Belski <ab@php.net>
	Fri, 29 Jul 2016 11:07:43 +0000 (13:07 +0200)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history