From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Jul 2017 22:13:25 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.14.0-rc1~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5eada8987e79f216f2002a3cd991360a50cd577c?hp=-c

Sync with maint

* maint:
fixes from 'master' for 2.13.4
---

5eada8987e79f216f2002a3cd991360a50cd577c