Merge branch 'maint' of git://linux-nfs.org/~bfields/git
commitc477553b2f4f621216b25800e121af52e0750087
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Dec 2007 17:23:55 +0000 (31 09:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Dec 2007 17:23:55 +0000 (31 09:23 -0800)
tree9471bdd9502427155e8b184535eb5257abfd5fac
parentab11903225270be7001b8c92f6ac4e165eaf4ecf
parent57283291b55cdc4ab726231073450d185beb361a
Merge branch 'maint' of git://linux-nfs.org/~bfields/git

* 'maint' of git://linux-nfs.org/~bfields/git:
  Documentation/user-manual.txt: fix typo
  Documentation: fix remote.<name>.skipDefaultUpdate description
Documentation/config.txt
Documentation/user-manual.txt