From: Junio C Hamano <junkio@cox.net>
Date: Tue, 9 Aug 2005 05:57:57 +0000 (-0700)
Subject: Merge with master.
X-Git-Tag: v0.99.4~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c3958a7926ab20b90fe0767580b466698477f5b6?hp=--cc

Merge with master.

This merges commit
c882bc932f6702a935c748893536356b0bba11ce
from master into our head commit
e764a10b17610ed9b3969bdb351e09f9635eb0ab

Sincerely,
jit-merge command.
---

c3958a7926ab20b90fe0767580b466698477f5b6