From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 May 2012 22:37:28 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.11-rc0~58
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/16798d0f48c64c4d967c1598a6748ff8c1b87112?ds=inline;hp=--cc

Merge branch 'maint'

* maint:
---

16798d0f48c64c4d967c1598a6748ff8c1b87112