From: Junio C Hamano <junkio@cox.net>
Date: Thu, 17 Nov 2005 10:00:25 +0000 (-0800)
Subject: Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff
X-Git-Tag: v0.99.9k~2^2~6
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=a575603af20a795584d79b32c30bda10fcae5d3f

Merge branch 'tojunio' of locke.catalyst.net.nz/git/git-martinlanghoff
---

a575603af20a795584d79b32c30bda10fcae5d3f