Merge branch 'PHP-7.0'

author Andrey Hristov <andrey@php.net>

Wed, 16 Mar 2016 09:55:09 +0000 (10:55 +0100)

committer Andrey Hristov <andrey@php.net>

Wed, 16 Mar 2016 09:55:09 +0000 (10:55 +0100)
author Andrey Hristov <andrey@php.net>
Wed, 16 Mar 2016 09:55:09 +0000 (10:55 +0100)
committer Andrey Hristov <andrey@php.net>
Wed, 16 Mar 2016 09:55:09 +0000 (10:55 +0100)
diff --cc ext/mysqlnd/mysqlnd_charset.c
Simple merge
diff --cc ext/mysqlnd/mysqlnd_debug.c
Simple merge
diff --cc ext/mysqlnd/mysqlnd_driver.c
Simple merge
author	Andrey Hristov <andrey@php.net>
	Wed, 16 Mar 2016 09:55:09 +0000 (10:55 +0100)
committer	Andrey Hristov <andrey@php.net>
	Wed, 16 Mar 2016 09:55:09 +0000 (10:55 +0100)
		1	2
ext/mysqlnd/mysqlnd_charset.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd_debug.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd_driver.c	patch \|	diff1 \|	diff2 \|	blob \| history