From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2016 20:42:37 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.10.0-rc0~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=789808fe48670f2fce59da45a82a2a18f489e300;p=thirdparty%2Fgit.git

Sync with maint

* maint:
  More fixes for 2.9.1
  mailmap: use main email address for dturner
---

789808fe48670f2fce59da45a82a2a18f489e300