Merge branch 'maint-1.6.0' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 21:43:24 +0000 (14:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 21:43:24 +0000 (14:43 -0700)
* maint-1.6.0:
doc/git-daemon: add missing arguments to options
init: Do not segfault on big GIT_TEMPLATE_DIR environment variable

No differences found