Merge branch 'per_column_option' into force_not_null
authorShigeru Hanada <[email protected]>
Tue, 5 Jul 2011 05:03:28 +0000 (14:03 +0900)
committerShigeru Hanada <[email protected]>
Tue, 5 Jul 2011 05:03:28 +0000 (14:03 +0900)
commitda69779b6b41a3b6f3db1f5770382dbd7f373c88
tree82531d8726083ebbb8705184a5e4b4450e3925f5
parent2083b8f99b9696ab4fe22574494579dfcbb0a74c
parent971dee43a78ae3363ba835bf571a299c6193851c
Merge branch 'per_column_option' into force_not_null

Conflicts:
contrib/file_fdw/file_fdw.c
contrib/file_fdw/file_fdw.c