From: Junio C Hamano <junkio@cox.net>
Date: Tue, 9 Aug 2005 17:22:23 +0000 (-0700)
Subject: Merge with master.
X-Git-Tag: v0.99.4~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=edee414c3e5a546aae3dd1529f397df949713305;p=git.git

Merge with master.

This merges commit
    f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda
from master into our head commit
    c3958a7926ab20b90fe0767580b466698477f5b6

Sincerely,
    jit-merge command.
---

edee414c3e5a546aae3dd1529f397df949713305