Adding a .mailmap file to merge duplicate persons output by, for example, git shortlog and canonicalize their names and e-mail addresses.
Merge pull request #1420 from embray/mailmap

Add a .mailmap file