From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 Sep 2017 05:48:08 +0000 (+0900)
Subject: Sync with 2.12.5
X-Git-Tag: v2.13.6~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1df0306d9b6a9e92c646dab77683c2a72957d03d?ds=inline;hp=--cc

Sync with 2.12.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

1df0306d9b6a9e92c646dab77683c2a72957d03d