Merge branch 'js/mailmap'
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:55 +0000 (18:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:55 +0000 (18:23 +0900)
Update the mailmap to unify multiple entries for the authors with
commits since v2.10.

* js/mailmap:
Update .mailmap

Trivial merge