From: Junio C Hamano <junkio@cox.net>
Date: Mon, 8 Aug 2005 00:10:50 +0000 (-0700)
Subject: Merge with master.
X-Git-Tag: v0.99.4~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=16cc55ce1fba4885ab8fa7a11a520c0db14ef315;p=git.git

Merge with master.

This merges commit
    d59a6043a8a7aed97c684fb4f14fe5221df1fcaf
from master into our head commit
    1ff53bfdeea4d707571c9cae818888c070b51153

Sincerely,
    jit-merge command.
---

16cc55ce1fba4885ab8fa7a11a520c0db14ef315