Merge branch 'js/mailmap'

Update the mailmap to unify multiple entries for the authors with commits since v2.10. * js/mailmap: Update .mailmap

Junio C Hamano committed Nov 18, 2018 at 18:23 UTC 5d90463e8cb03e4d13cb6605b7c971c652c287ee

No changes.