From: Junio C Hamano <junkio@cox.net>
Date: Tue, 9 Aug 2005 01:02:39 +0000 (-0700)
Subject: Merge with master.
X-Git-Tag: v0.99.4~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e764a10b17610ed9b3969bdb351e09f9635eb0ab;p=git.git

Merge with master.

This merges commit
    3c4e8a636f4de3668b24d0020df731cdc78ae6e9
from master into our head commit
    80f45687f44b6258b0eacae6b1ae15e3ad4a6552

Sincerely,
    jit-merge command.
---

e764a10b17610ed9b3969bdb351e09f9635eb0ab