From: Junio C Hamano <junkio@cox.net>
Date: Sun, 21 Aug 2005 20:59:38 +0000 (-0700)
Subject: Merge refs/heads/master from .
X-Git-Tag: v0.99.5~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=15ac5164427d838d9377643dcdd03edd770cf001;p=git.git

Merge refs/heads/master from .
---

15ac5164427d838d9377643dcdd03edd770cf001