Merge branch 'master' into fdw_select_simple

author Shigeru Hanada <[email protected]>

Tue, 16 Nov 2010 10:03:02 +0000 (19:03 +0900)

committer Shigeru Hanada <[email protected]>

Tue, 16 Nov 2010 10:03:02 +0000 (19:03 +0900)
author Shigeru Hanada <[email protected]>
Tue, 16 Nov 2010 10:03:02 +0000 (19:03 +0900)
committer Shigeru Hanada <[email protected]>
Tue, 16 Nov 2010 10:03:02 +0000 (19:03 +0900)
diff --cc src/backend/commands/sequence.c
Simple merge
diff --cc src/include/catalog/pg_proc.h
Simple merge
author	Shigeru Hanada <[email protected]>
	Tue, 16 Nov 2010 10:03:02 +0000 (19:03 +0900)
committer	Shigeru Hanada <[email protected]>
	Tue, 16 Nov 2010 10:03:02 +0000 (19:03 +0900)
		1	2
src/backend/commands/sequence.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/catalog/pg_proc.h	patch \|	diff1 \|	diff2 \|	blob \| history