Merge branch 'PHP-7.0'

author Anatol Belski <ab@php.net>

Thu, 17 Mar 2016 11:49:34 +0000 (12:49 +0100)

committer Anatol Belski <ab@php.net>

Thu, 17 Mar 2016 11:49:34 +0000 (12:49 +0100)
author Anatol Belski <ab@php.net>
Thu, 17 Mar 2016 11:49:34 +0000 (12:49 +0100)
committer Anatol Belski <ab@php.net>
Thu, 17 Mar 2016 11:49:34 +0000 (12:49 +0100)
diff --cc ext/mysqli/mysqli.c
Simple merge
diff --cc ext/pgsql/pgsql.c
Simple merge
author	Anatol Belski <ab@php.net>
	Thu, 17 Mar 2016 11:49:34 +0000 (12:49 +0100)
committer	Anatol Belski <ab@php.net>
	Thu, 17 Mar 2016 11:49:34 +0000 (12:49 +0100)
		1	2
ext/mysqli/mysqli.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pgsql/pgsql.c	patch \|	diff1 \|	diff2 \|	blob \| history