Merge branch 'ms/daemon-doc-typo' into maint
commitc2e585f530e6339ff3eab0405de6286b7f929b28
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:39:16 +0000 (6 15:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:39:16 +0000 (6 15:39 -0700)
treeeb9f004809781e3deb5b2af216541bf4486bf729
parent05f5ba6b5d20da55d8bac416eec1ff01adecc5c3
parentc6056fbc614100f971d01bbff5dc4a7e8eaa9bcb
Merge branch 'ms/daemon-doc-typo' into maint

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