From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 18 Apr 2009 21:45:59 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc1~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cef5775b9f640beb51b07f8a296cfcc9b11b9744

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
---

cef5775b9f640beb51b07f8a296cfcc9b11b9744