From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 May 2008 21:42:30 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~29
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1af8bca79766198c591d8db58f778a98e96627e2;p=git.git

Merge branch 'maint'

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

1af8bca79766198c591d8db58f778a98e96627e2