Merge branch 'PHP-5.6' into PHP-7.0

author Julien Pauli <jpauli@php.net>

Thu, 24 Dec 2015 09:33:41 +0000 (10:33 +0100)

committer Julien Pauli <jpauli@php.net>

Thu, 24 Dec 2015 09:33:41 +0000 (10:33 +0100)
author Julien Pauli <jpauli@php.net>
Thu, 24 Dec 2015 09:33:41 +0000 (10:33 +0100)
committer Julien Pauli <jpauli@php.net>
Thu, 24 Dec 2015 09:33:41 +0000 (10:33 +0100)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Julien Pauli <jpauli@php.net>
	Thu, 24 Dec 2015 09:33:41 +0000 (10:33 +0100)
committer	Julien Pauli <jpauli@php.net>
	Thu, 24 Dec 2015 09:33:41 +0000 (10:33 +0100)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history