Merge branch 'PHP-5.6'

author Peter Cowburn <petercowburn@gmail.com>

Wed, 19 Nov 2014 17:06:59 +0000 (17:06 +0000)

committer Peter Cowburn <petercowburn@gmail.com>

Wed, 19 Nov 2014 17:06:59 +0000 (17:06 +0000)
author Peter Cowburn <petercowburn@gmail.com>
Wed, 19 Nov 2014 17:06:59 +0000 (17:06 +0000)
committer Peter Cowburn <petercowburn@gmail.com>
Wed, 19 Nov 2014 17:06:59 +0000 (17:06 +0000)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Peter Cowburn <petercowburn@gmail.com>
	Wed, 19 Nov 2014 17:06:59 +0000 (17:06 +0000)
committer	Peter Cowburn <petercowburn@gmail.com>
	Wed, 19 Nov 2014 17:06:59 +0000 (17:06 +0000)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history