Merge branch 'PHP-5.4' into PHP-5.5

author Xinchen Hui <laruence@php.net>

Fri, 30 Nov 2012 06:30:37 +0000 (14:30 +0800)

committer Xinchen Hui <laruence@php.net>

Fri, 30 Nov 2012 06:30:37 +0000 (14:30 +0800)
author Xinchen Hui <laruence@php.net>
Fri, 30 Nov 2012 06:30:37 +0000 (14:30 +0800)
committer Xinchen Hui <laruence@php.net>
Fri, 30 Nov 2012 06:30:37 +0000 (14:30 +0800)
diff --cc ext/mysqli/mysqli_nonapi.c
Simple merge
diff --cc main/output.c
Simple merge
author	Xinchen Hui <laruence@php.net>
	Fri, 30 Nov 2012 06:30:37 +0000 (14:30 +0800)
committer	Xinchen Hui <laruence@php.net>
	Fri, 30 Nov 2012 06:30:37 +0000 (14:30 +0800)
		1	2
ext/mysqli/mysqli_nonapi.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/output.c	patch \|	diff1 \|	diff2 \|	blob \| history