Merge branch 'master' into per_column_option

author Shigeru Hanada <[email protected]>

Thu, 7 Jul 2011 00:28:08 +0000 (09:28 +0900)

committer Shigeru Hanada <[email protected]>

Thu, 7 Jul 2011 00:28:08 +0000 (09:28 +0900)
author Shigeru Hanada <[email protected]>
Thu, 7 Jul 2011 00:28:08 +0000 (09:28 +0900)
committer Shigeru Hanada <[email protected]>
Thu, 7 Jul 2011 00:28:08 +0000 (09:28 +0900)
diff --cc doc/src/sgml/ref/psql-ref.sgml
Simple merge
diff --cc src/bin/psql/describe.c
Simple merge
author	Shigeru Hanada <[email protected]>
	Thu, 7 Jul 2011 00:28:08 +0000 (09:28 +0900)
committer	Shigeru Hanada <[email protected]>
	Thu, 7 Jul 2011 00:28:08 +0000 (09:28 +0900)
		1	2
doc/src/sgml/ref/psql-ref.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
src/bin/psql/describe.c	patch \|	diff1 \|	diff2 \|	blob \| history