From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 May 2011 21:43:45 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.6-rc0~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be0dca39e960d67511ca5a75887b903ccae7ccce;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  t3701: fix here document
  git-fast-import.txt: --relative-marks takes no parameter
  shell: add missing initialization of argv0_path
---

be0dca39e960d67511ca5a75887b903ccae7ccce