From: Junio C Hamano <junkio@cox.net>
Date: Wed, 10 Aug 2005 07:10:18 +0000 (-0700)
Subject: Merge with master.
X-Git-Tag: v0.99.4~3
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=f69714c38c6f3296a4bfba0d057e0f1605373f49

Merge with master.

This merges commit
    c35a7b8d806317dc1762e36561cbd31c2530dd9c
from master into our head commit
    edee414c3e5a546aae3dd1529f397df949713305

Sincerely,
    jit-merge command.
---

f69714c38c6f3296a4bfba0d057e0f1605373f49