Merge branch 'PHP-5.6' into PHP-7.0

author Christoph M. Becker <cmbecker69@gmx.de>

Mon, 26 Sep 2016 16:43:03 +0000 (18:43 +0200)

committer Christoph M. Becker <cmbecker69@gmx.de>

Mon, 26 Sep 2016 16:43:03 +0000 (18:43 +0200)
author Christoph M. Becker <cmbecker69@gmx.de>
Mon, 26 Sep 2016 16:43:03 +0000 (18:43 +0200)
committer Christoph M. Becker <cmbecker69@gmx.de>
Mon, 26 Sep 2016 16:43:03 +0000 (18:43 +0200)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 26 Sep 2016 16:43:03 +0000 (18:43 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 26 Sep 2016 16:43:03 +0000 (18:43 +0200)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history