Merge branch 'PHP-5.4' into PHP-5.5

author Anatol Belski <ab@php.net>

Mon, 14 Apr 2014 07:33:31 +0000 (09:33 +0200)

committer Anatol Belski <ab@php.net>

Mon, 14 Apr 2014 07:33:31 +0000 (09:33 +0200)
author Anatol Belski <ab@php.net>
Mon, 14 Apr 2014 07:33:31 +0000 (09:33 +0200)
committer Anatol Belski <ab@php.net>
Mon, 14 Apr 2014 07:33:31 +0000 (09:33 +0200)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Anatol Belski <ab@php.net>
	Mon, 14 Apr 2014 07:33:31 +0000 (09:33 +0200)
committer	Anatol Belski <ab@php.net>
	Mon, 14 Apr 2014 07:33:31 +0000 (09:33 +0200)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history