Merge pull request #563 from libexpat/extend-mailmap

Extend .mailmap