Merge branch 'ms/daemon-doc-typo' into maint

* ms/daemon-doc-typo: Documentation/git-daemon: add missing word

Junio C Hamano committed Aug 6, 2012 at 15:39 UTC c2e585f530e6339ff3eab0405de6286b7f929b28

No changes.