Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 21:27:59 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 21:27:59 +0000 (14:27 -0700)
commit008442f5e798e511cc0cd5d9443552b0d107d558
treee390298df6995f791998f08b2a269b8f61389d45
parente4d594c6bdcb25b996120fe21c901af7a08a7f6d
parente77b0b5d0fdac411607dbae11ccad87dccd332d3
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  git-am: fix typo in usage message
  doc/git-daemon: s/uploadarchive/uploadarch/
git-am.sh