Update in the list of contributors from the Git history.

Update in the list of contributors from the Git history.

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.