Merge branch 'release'
[notmuch] / .mailmap
2016-09-09 David BremnerMerge branch 'release'
2016-07-28 David Bremnercreate .mailmap file (for git shortlog/blame)