From: Shigeru Hanada <hanada@metrosystems.co.jp>
Date: Fri, 17 Dec 2010 00:40:19 +0000 (+0900)
Subject: Merge branch 'master' into fdw_syntax
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=7f0e7aa45cdd2da32c886ada3a14d2ab3542ff0b;p=users%2Fhanada%2Fpostgres.git

Merge branch 'master' into fdw_syntax

Conflicts:
	src/include/catalog/catversion.h
---

7f0e7aa45cdd2da32c886ada3a14d2ab3542ff0b