Merge branch 'ms/daemon-doc-typo' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:39:16 +0000 (15:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:39:16 +0000 (15:39 -0700)
* ms/daemon-doc-typo:
Documentation/git-daemon: add missing word

1  2 
Documentation/git-daemon.txt
Simple merge