Merge branch 'sb/mailmap'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:35 +0000 (12:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:35 +0000 (12:20 -0700)
* sb/mailmap:
.mailmap: merge different spellings of names

Trivial merge