Merge branch 'PHP-5.4' into PHP-5.5

author Matteo Beccati <mbeccati@php.net>

Thu, 22 Aug 2013 13:34:11 +0000 (15:34 +0200)

committer Matteo Beccati <mbeccati@php.net>

Thu, 22 Aug 2013 13:34:11 +0000 (15:34 +0200)
author Matteo Beccati <mbeccati@php.net>
Thu, 22 Aug 2013 13:34:11 +0000 (15:34 +0200)
committer Matteo Beccati <mbeccati@php.net>
Thu, 22 Aug 2013 13:34:11 +0000 (15:34 +0200)
diff --cc ext/pdo/pdo_stmt.c
Simple merge
diff --cc ext/pgsql/pgsql.c
Simple merge
author	Matteo Beccati <mbeccati@php.net>
	Thu, 22 Aug 2013 13:34:11 +0000 (15:34 +0200)
committer	Matteo Beccati <mbeccati@php.net>
	Thu, 22 Aug 2013 13:34:11 +0000 (15:34 +0200)
		1	2
ext/pdo/pdo_stmt.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pgsql/pgsql.c	patch \|	diff1 \|	diff2 \|	blob \| history