Update .mailmap file
Merge pull request #614 from stefanbeller/master

Update .mailmap file