![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 25 Mar 2007 22:07:27 +0000 (15:07 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 25 Mar 2007 22:07:27 +0000 (15:07 -0700) | ||
| commit | fd2a75972e90d34bc8d4bebe1d669645557a2192 | |
| tree | 3a6a8f612677447eb65bc8a1420b7dbcdaa8c792 | tree | snapshot |
| parent | cd67c8e0bc6f61ffccc12d1775bc1a200df5fe85 | commit | diff |
| parent | 81b6c950dede5bca60dac0834de25b6f30ec10bb | commit | diff |
Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint
* '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
* '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