From: Junio C Hamano <junkio@cox.net>
Date: Sun, 7 Aug 2005 21:12:38 +0000 (-0700)
Subject: Merge with master.
X-Git-Tag: v0.99.4~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1ff53bfdeea4d707571c9cae818888c070b51153;p=git.git

Merge with master.

This merges commit
    6b7242aa1acc3c7835f80522914ffc4b2e789a29
from master into our head commit
    f29eaed12fc07bc5b2e4d1a302136a26ff4488ce

Sincerely,
    jit-merge command.
---

1ff53bfdeea4d707571c9cae818888c070b51153