From: Junio C Hamano <junkio@cox.net>
Date: Sun, 13 Aug 2006 02:23:09 +0000 (-0700)
Subject: Merge branch 'jn/conf'
X-Git-Tag: v1.4.3-rc1~276
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=86183fbb09ffe5d46eae1cf52023a1b5f8fbc047;p=git.git

Merge branch 'jn/conf'
---

86183fbb09ffe5d46eae1cf52023a1b5f8fbc047