From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Apr 2011 20:59:19 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6c4c9bdc981180e94b06ba3a29a59288601361a4

Merge branch 'maint'

* maint:
---

6c4c9bdc981180e94b06ba3a29a59288601361a4