From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 28 Jun 2015 21:51:12 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.5.0-rc1~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/912bd497e93f0235a5999a77f8d54f5ff80a3a03

Sync with maint

* maint:
---

912bd497e93f0235a5999a77f8d54f5ff80a3a03