Merge branch 'PHP-5.4'

author Florian Anderiasch <fa@php.net>

Tue, 24 Jul 2012 12:34:41 +0000 (14:34 +0200)

committer Florian Anderiasch <fa@php.net>

Tue, 24 Jul 2012 12:34:41 +0000 (14:34 +0200)
author Florian Anderiasch <fa@php.net>
Tue, 24 Jul 2012 12:34:41 +0000 (14:34 +0200)
committer Florian Anderiasch <fa@php.net>
Tue, 24 Jul 2012 12:34:41 +0000 (14:34 +0200)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Florian Anderiasch <fa@php.net>
	Tue, 24 Jul 2012 12:34:41 +0000 (14:34 +0200)
committer	Florian Anderiasch <fa@php.net>
	Tue, 24 Jul 2012 12:34:41 +0000 (14:34 +0200)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history