Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:42:37 +0000 (13:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:42:37 +0000 (13:42 -0700)
* maint:
More fixes for 2.9.1
mailmap: use main email address for dturner

Trivial merge