From: Junio C Hamano <junkio@cox.net>
Date: Thu, 22 Dec 2005 07:48:31 +0000 (-0800)
Subject: Merge branch 'fixes'
X-Git-Tag: v1.1.0~36
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ebc12ce5bfcf6401c8fcc7e4935bc50142a65db4;p=git.git

Merge branch 'fixes'
---

ebc12ce5bfcf6401c8fcc7e4935bc50142a65db4