Merge branch 'master' into fdw_syntax
authorShigeru Hanada <[email protected]>
Fri, 17 Dec 2010 00:40:19 +0000 (09:40 +0900)
committerShigeru Hanada <[email protected]>
Fri, 17 Dec 2010 00:40:19 +0000 (09:40 +0900)
commit7f0e7aa45cdd2da32c886ada3a14d2ab3542ff0b
treeb962436c1e271ccf37807f2839eb1da0233a5845
parentaededd781f736b5d10a1950e3e7c8076b700d47a
parent14ed7735f5bb5275da13891c4bb106c198d00b53
Merge branch 'master' into fdw_syntax

Conflicts:
src/include/catalog/catversion.h
src/include/catalog/pg_proc.h
src/include/utils/builtins.h