From: Junio C Hamano <junkio@cox.net>
Date: Wed, 10 Aug 2005 17:55:54 +0000 (-0700)
Subject: Merge with master.
X-Git-Tag: v0.99.4~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bdb71a41caa9ffed2e3207736c21fffbc2007670;p=git.git

Merge with master.

This merges commit
    ef0bd2e6e643f09a8294937caf99463328b9215a
from master into our head commit
    f69714c38c6f3296a4bfba0d057e0f1605373f49

Sincerely,
    jit-merge command.
---

bdb71a41caa9ffed2e3207736c21fffbc2007670