From: Junio C Hamano <junkio@cox.net>
Date: Thu, 16 Feb 2006 03:45:03 +0000 (-0800)
Subject: Merge master to get fixes up to 1.2.1
X-Git-Tag: v1.3.0-rc1~54^2~69
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=bf0a25560b9cb0acac61ea57245852bc7d3431e9

Merge master to get fixes up to 1.2.1
---

bf0a25560b9cb0acac61ea57245852bc7d3431e9