From: Junio C Hamano <junkio@cox.net>
Date: Wed, 17 Aug 2005 21:25:08 +0000 (-0700)
Subject: Merge changes from master.
X-Git-Tag: v0.99.5~16
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=ca08acca68bf0e1c89fcbc29af18b68ea7bf5c36;p=git.git

Merge changes from master.
---

ca08acca68bf0e1c89fcbc29af18b68ea7bf5c36