Andrew's git / gitweb.git / diff
?
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)
* maint:
git-am: fix typo in usage message
doc/git-daemon: s/uploadarchive/uploadarch/

Trivial merge