Merge with master changes.
authorJunio C Hamano <redacted>
Wed, 17 Aug 2005 01:49:04 +0000 (18:49 -0700)
committerJunio C Hamano <redacted>
Wed, 17 Aug 2005 01:49:04 +0000 (18:49 -0700)

Trivial merge
git clone https://git.99rst.org/PROJECT