Merge branch 'foreign_scan' into file_fdw

author Shigeru Hanada <[email protected]>

Thu, 17 Feb 2011 08:15:36 +0000 (17:15 +0900)

committer Shigeru Hanada <[email protected]>

Thu, 17 Feb 2011 08:15:36 +0000 (17:15 +0900)
author Shigeru Hanada <[email protected]>
Thu, 17 Feb 2011 08:15:36 +0000 (17:15 +0900)
committer Shigeru Hanada <[email protected]>
Thu, 17 Feb 2011 08:15:36 +0000 (17:15 +0900)
diff --cc doc/src/sgml/contrib.sgml
Simple merge
diff --cc src/test/regress/expected/alter_table.out
Simple merge
author	Shigeru Hanada <[email protected]>
	Thu, 17 Feb 2011 08:15:36 +0000 (17:15 +0900)
committer	Shigeru Hanada <[email protected]>
	Thu, 17 Feb 2011 08:15:36 +0000 (17:15 +0900)
		1	2
doc/src/sgml/contrib.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/regress/expected/alter_table.out	patch \|	diff1 \|	diff2 \|	blob \| history