From: Junio C Hamano <junkio@cox.net>
Date: Wed, 10 Aug 2005 20:20:08 +0000 (-0700)
Subject: Merge with master.
X-Git-Tag: v0.99.4~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df6a6f0e87c44ff6daab7de3fde2237555ae95ac;p=thirdparty%2Fgit.git

Merge with master.

This merges commit
    e8c80638abc99928dba9ac832589749a531e2e21
from master into our head commit
    bdb71a41caa9ffed2e3207736c21fffbc2007670

Sincerely,
    jit-merge command.
---

df6a6f0e87c44ff6daab7de3fde2237555ae95ac