mailmap: Coalesce some identities
Merge pull request #1494 from nulltoken/fix/mailmap

mailmap: Coalesce some identities