Merge branch 'catch-html-parse-error'
[rss2email.git] / .mailmap
2012-12-08 W. Trevor KingMerge remote-tracking branch 's-o-b/contributing-github'
2012-11-13 W. Trevor King.mailmap: map Lindsey's usernames to a canonical form