Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 21:42:30 +0000 (14:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 21:42:30 +0000 (14:42 -0700)
commit1af8bca79766198c591d8db58f778a98e96627e2
tree4095ac81dbabe081c9687d4ff3acb67608b36580
parent9d880582ee0e63b3865350e90d3576fec55aed20
parent008442f5e798e511cc0cd5d9443552b0d107d558
Merge branch 'maint'

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