From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Nov 2014 20:45:48 +0000 (-0800)
Subject: Sync with maint
X-Git-Tag: v2.2.0-rc2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f6f61cbbad0611e03b712cc354f1665b5d7b087e?ds=inline;hp=-c

Sync with maint

* maint:
---

f6f61cbbad0611e03b712cc354f1665b5d7b087e