From: Junio C Hamano <junkio@cox.net>
Date: Mon, 16 Jan 2006 05:12:12 +0000 (-0800)
Subject: Merge branch 'fixo/1.0'
X-Git-Tag: v1.1.3^2~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7cb038a692ec0bdc0f442380678e8e87e26d4e68;p=git.git

Merge branch 'fixo/1.0'
---

7cb038a692ec0bdc0f442380678e8e87e26d4e68