From: Junio C Hamano <junkio@cox.net>
Date: Thu, 4 May 2006 06:00:02 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.0-rc1~188
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd371b49f98d9c08f7fbd4900976739a6aeb9ec6;p=git.git

Merge branch 'maint'

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

dd371b49f98d9c08f7fbd4900976739a6aeb9ec6