Merge branch 'PHP-7.0'

author Anatol Belski <ab@php.net>

Mon, 9 May 2016 15:29:56 +0000 (17:29 +0200)

committer Anatol Belski <ab@php.net>

Mon, 9 May 2016 15:29:56 +0000 (17:29 +0200)
author Anatol Belski <ab@php.net>
Mon, 9 May 2016 15:29:56 +0000 (17:29 +0200)
committer Anatol Belski <ab@php.net>
Mon, 9 May 2016 15:29:56 +0000 (17:29 +0200)
diff --cc ext/mysqli/mysqli.c
Simple merge
diff --cc ext/pgsql/pgsql.c
Simple merge
author	Anatol Belski <ab@php.net>
	Mon, 9 May 2016 15:29:56 +0000 (17:29 +0200)
committer	Anatol Belski <ab@php.net>
	Mon, 9 May 2016 15:29:56 +0000 (17:29 +0200)
		1	2
ext/mysqli/mysqli.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pgsql/pgsql.c	patch \|	diff1 \|	diff2 \|	blob \| history