Merge branch 'fdw_core' into pgsql_fdw

author Shigeru Hanada <[email protected]>

Thu, 25 Nov 2010 04:17:34 +0000 (13:17 +0900)

committer Shigeru Hanada <[email protected]>

Thu, 25 Nov 2010 04:17:34 +0000 (13:17 +0900)
author Shigeru Hanada <[email protected]>
Thu, 25 Nov 2010 04:17:34 +0000 (13:17 +0900)
committer Shigeru Hanada <[email protected]>
Thu, 25 Nov 2010 04:17:34 +0000 (13:17 +0900)
diff --cc contrib/README
Simple merge
diff --cc doc/src/sgml/contrib.sgml
Simple merge
diff --cc doc/src/sgml/filelist.sgml
Simple merge
diff --cc src/test/regress/expected/foreign_data.out
Simple merge
author	Shigeru Hanada <[email protected]>
	Thu, 25 Nov 2010 04:17:34 +0000 (13:17 +0900)
committer	Shigeru Hanada <[email protected]>
	Thu, 25 Nov 2010 04:17:34 +0000 (13:17 +0900)
		1	2
contrib/README	patch \|	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/contrib.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/filelist.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/regress/expected/foreign_data.out	patch \|	diff1 \|	diff2 \|	blob \| history