Merge branch 'maint'
commitdd371b49f98d9c08f7fbd4900976739a6aeb9ec6
authorJunio C Hamano <junkio@cox.net>
Thu, 4 May 2006 06:00:02 +0000 (3 23:00 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 4 May 2006 06:00:02 +0000 (3 23:00 -0700)
tree19621f09430f79378630184c6e0746cd79e9e6da
parentdcb3450fd8785d76dd3d25aa49be66190aa5e7f3
parent7abd7117ec57b8c3c2a469db62c7811fdac5c655
Merge branch 'maint'

* maint:
  Add a few more words to the glossary.
  Added definitions for a few words:
  Alphabetize the glossary.