Merge branch 'maint'

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

Junio C Hamano committed May 5, 2011 at 14:43 UTC be0dca39e960d67511ca5a75887b903ccae7ccce

No changes.