From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Sep 2015 21:34:57 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.6.0-rc1~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ec371ff6e382d660458eeb8c337d4744985bf308

Sync with maint

* maint:
---

ec371ff6e382d660458eeb8c337d4744985bf308