Merge branch 'PHP-5.6' into PHP-7.0

author Matteo Beccati <mbeccati@php.net>

Thu, 4 Aug 2016 07:30:48 +0000 (09:30 +0200)

committer Matteo Beccati <mbeccati@php.net>

Thu, 4 Aug 2016 07:30:48 +0000 (09:30 +0200)
author Matteo Beccati <mbeccati@php.net>
Thu, 4 Aug 2016 07:30:48 +0000 (09:30 +0200)
committer Matteo Beccati <mbeccati@php.net>
Thu, 4 Aug 2016 07:30:48 +0000 (09:30 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/pdo_pgsql/pgsql_driver.c
Simple merge
diff --cc ext/pdo_pgsql/php_pdo_pgsql_int.h
Simple merge
author	Matteo Beccati <mbeccati@php.net>
	Thu, 4 Aug 2016 07:30:48 +0000 (09:30 +0200)
committer	Matteo Beccati <mbeccati@php.net>
	Thu, 4 Aug 2016 07:30:48 +0000 (09:30 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pdo_pgsql/pgsql_driver.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pdo_pgsql/php_pdo_pgsql_int.h	patch \|	diff1 \|	diff2 \|	blob \| history