From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 11 Dec 2010 00:36:19 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~67
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=271c2aa6eed21d4ef9d8d6c2298121545e6ce123;p=git.git

Merge branch 'maint'
---

271c2aa6eed21d4ef9d8d6c2298121545e6ce123