Merge branch 'PHP-5.4'

author Xinchen Hui <laruence@php.net>

Fri, 25 May 2012 14:34:06 +0000 (22:34 +0800)

committer Xinchen Hui <laruence@php.net>

Fri, 25 May 2012 14:34:06 +0000 (22:34 +0800)
author Xinchen Hui <laruence@php.net>
Fri, 25 May 2012 14:34:06 +0000 (22:34 +0800)
committer Xinchen Hui <laruence@php.net>
Fri, 25 May 2012 14:34:06 +0000 (22:34 +0800)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Xinchen Hui <laruence@php.net>
	Fri, 25 May 2012 14:34:06 +0000 (22:34 +0800)
committer	Xinchen Hui <laruence@php.net>
	Fri, 25 May 2012 14:34:06 +0000 (22:34 +0800)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history