Merge branch 'per_column_option' into force_not_null
authorShigeru Hanada <[email protected]>
Wed, 6 Jul 2011 01:56:02 +0000 (10:56 +0900)
committerShigeru Hanada <[email protected]>
Wed, 6 Jul 2011 01:56:02 +0000 (10:56 +0900)
commit58c8ff48ab654561381924112dcaa5ccfbcfe123
treea08a28dff246e6d193ff8b1887a9bbe810875c11
parentda69779b6b41a3b6f3db1f5770382dbd7f373c88
parent9461d72639824d9e47b66c7aaeeb86c5f020cdde
Merge branch 'per_column_option' into force_not_null

Conflicts:
contrib/file_fdw/file_fdw.c
contrib/file_fdw/file_fdw.c
contrib/file_fdw/input/file_fdw.source
contrib/file_fdw/output/file_fdw.source