Merge branch 'PHP-5.4' into PHP-5.5

author Andrey Hristov <andrey@php.net>

Wed, 4 Dec 2013 10:07:18 +0000 (12:07 +0200)

committer Andrey Hristov <andrey@php.net>

Wed, 4 Dec 2013 10:07:18 +0000 (12:07 +0200)
author Andrey Hristov <andrey@php.net>
Wed, 4 Dec 2013 10:07:18 +0000 (12:07 +0200)
committer Andrey Hristov <andrey@php.net>
Wed, 4 Dec 2013 10:07:18 +0000 (12:07 +0200)
diff --cc ext/mysqli/mysqli_nonapi.c
Simple merge
diff --cc ext/mysqlnd/mysqlnd.c
Simple merge
diff --cc ext/mysqlnd/mysqlnd.h
Simple merge
author	Andrey Hristov <andrey@php.net>
	Wed, 4 Dec 2013 10:07:18 +0000 (12:07 +0200)
committer	Andrey Hristov <andrey@php.net>
	Wed, 4 Dec 2013 10:07:18 +0000 (12:07 +0200)
		1	2
ext/mysqli/mysqli_nonapi.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd.h	patch \|	diff1 \|	diff2 \|	blob \| history