From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Apr 2015 19:58:50 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.4.0-rc3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fb896362cc12dfc0df69be6c9d75936f9c7cc7ff?ds=inline;hp=--cc

Sync with maint
---

fb896362cc12dfc0df69be6c9d75936f9c7cc7ff