updated .mailmap
Merge pull request #3612 from ivanov/mailmap

updated .mailmap