From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 May 2011 17:29:24 +0000 (-0700)
Subject: Merge branch 'maint-1.7.4' into maint
X-Git-Tag: v1.7.5.3~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a6d82d0865a616bf22b9bbc3baea1ad4bd4b21b;p=git.git

Merge branch 'maint-1.7.4' into maint

* maint-1.7.4:
---

5a6d82d0865a616bf22b9bbc3baea1ad4bd4b21b