Noth much interesting here, but I wanted to stop before the next upstream
commit, which is a mechanical Copyright year bump.

Conflicts:
	contrib/btree_gist/btree_gist.sql.in
	doc/FAQ
	doc/FAQ_DEV
	doc/FAQ_japanese
	doc/bug.template
	doc/src/FAQ/FAQ.html
	doc/src/FAQ/FAQ_DEV.html
	doc/src/FAQ/FAQ_japanese.html
	doc/src/sgml/ref/pg_ctl-ref.sgml
	doc/src/sgml/ref/postgres-ref.sgml
	doc/src/sgml/ref/reindex.sgml
	doc/src/sgml/release.sgml
	src/backend/access/gin/ginvacuum.c
	src/backend/access/heap/tuptoaster.c
	src/backend/main/main.c
	src/backend/postmaster/postmaster.c
	src/backend/tcop/postgres.c
	src/backend/utils/adt/float.c
	src/backend/utils/adt/regexp.c
	src/bin/pg_ctl/pg_ctl.c
	src/bin/pg_dump/dumputils.c
	src/include/catalog/pg_type.h
	src/include/pg_config.h.win32
	src/include/utils/builtins.h
	src/interfaces/ecpg/compatlib/Makefile
	src/interfaces/ecpg/ecpglib/Makefile
	src/interfaces/ecpg/pgtypeslib/Makefile
	src/interfaces/ecpg/preproc/Makefile
	src/interfaces/libpq/Makefile
	src/interfaces/libpq/libpq.rc.in
	src/port/win32ver.rc
	src/test/regress/pg_regress.c
	src/tools/RELEASE_CHANGES
	src/tools/copyright
	src/tools/msvc/Project.pm