Merge branch 'PHP-5.4' into PHP-5.5

author Adam Harvey <aharvey@php.net>

Tue, 1 Jul 2014 20:23:11 +0000 (13:23 -0700)

committer Adam Harvey <aharvey@php.net>

Tue, 1 Jul 2014 20:23:11 +0000 (13:23 -0700)
author Adam Harvey <aharvey@php.net>
Tue, 1 Jul 2014 20:23:11 +0000 (13:23 -0700)
committer Adam Harvey <aharvey@php.net>
Tue, 1 Jul 2014 20:23:11 +0000 (13:23 -0700)
diff --cc NEWS
Simple merge
diff --cc ext/pgsql/pgsql.c
Simple merge
author	Adam Harvey <aharvey@php.net>
	Tue, 1 Jul 2014 20:23:11 +0000 (13:23 -0700)
committer	Adam Harvey <aharvey@php.net>
	Tue, 1 Jul 2014 20:23:11 +0000 (13:23 -0700)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pgsql/pgsql.c	patch \|	diff1 \|	diff2 \|	blob \| history