Merge branch 'PHP-5.4' into PHP-5.5

author Andrey Hristov <andrey@php.net>

Wed, 9 Jan 2013 18:15:29 +0000 (19:15 +0100)

committer Andrey Hristov <andrey@php.net>

Wed, 9 Jan 2013 18:15:29 +0000 (19:15 +0100)
author Andrey Hristov <andrey@php.net>
Wed, 9 Jan 2013 18:15:29 +0000 (19:15 +0100)
committer Andrey Hristov <andrey@php.net>
Wed, 9 Jan 2013 18:15:29 +0000 (19:15 +0100)
diff --cc ext/mysqli/mysqli.c
Simple merge
diff --cc ext/mysqli/mysqli_api.c
Simple merge
author	Andrey Hristov <andrey@php.net>
	Wed, 9 Jan 2013 18:15:29 +0000 (19:15 +0100)
committer	Andrey Hristov <andrey@php.net>
	Wed, 9 Jan 2013 18:15:29 +0000 (19:15 +0100)
		1	2
ext/mysqli/mysqli.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqli/mysqli_api.c	patch \|	diff1 \|	diff2 \|	blob \| history