See MAPPING AUTHORS in git-shortlog(1) for details on .mailmap.

For both authors I've selected the email address that they've used
most recently.