Code

Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
authorJunio C Hamano <junkio@cox.net>
Sun, 25 Mar 2007 22:07:27 +0000 (15:07 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Mar 2007 22:07:27 +0000 (15:07 -0700)
* 'maint' of git://linux-nfs.org/~bfields/git:
  user-manual: introduce "branch" and "branch head" differently
  glossary: clean up cross-references
  glossary: stop generating automatically
  user-manual: Use def_ instead of ref_ for glossary references.
  user-manual.txt: fix a tiny typo.
  user-manual: run xsltproc without --nonet option


Trivial merge