Merge branch 'maint'

* maint:
Describe fixes since 1.6.2.3
doc/git-daemon: add missing arguments to max-connections option
doc/git-daemon: add missing arguments to options
init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
imap-send: use correct configuration variable in documentation

diff --cc Documentation/git-imap-send.txt
Simple merge

diff --cc builtin-init-db.c
Simple merge