Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 May 2011 21:43:45 +0000 (14:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 May 2011 21:43:45 +0000 (14:43 -0700)
* maint:
t3701: fix here document
git-fast-import.txt: --relative-marks takes no parameter
shell: add missing initialization of argv0_path

Trivial merge