Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 00:08:45 +0000 (17:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 00:08:45 +0000 (17:08 -0700)
* 'maint' of git://linux-nfs.org/~bfields/git:
User Manual: add a chapter for submodules
user-manual: don't assume refs are stored under .git/refs

Trivial merge