Merge branch 'maint' of git://linux-nfs.org/~bfields/git
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Dec 2007 17:23:55 +0000 (09:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Dec 2007 17:23:55 +0000 (09:23 -0800)
* 'maint' of git://linux-nfs.org/~bfields/git:
Documentation/user-manual.txt: fix typo
Documentation: fix remote.<name>.skipDefaultUpdate description

1  2 
Documentation/config.txt
Documentation/user-manual.txt
Simple merge
Simple merge