Merge "Add a .mailmap file"

This commit is contained in:
Jenkins 2016-04-12 16:25:41 +00:00 committed by Gerrit Code Review
commit 62f95b0b1b

6
.mailmap Normal file
View File

@ -0,0 +1,6 @@
Armin Ronacher <armin.ronacher@active-4.com> mitsuhiko <devnull@localhost>
Christopher Grebs <cg@webshox.org> Christopher Grebs <devnull@localhost>
Christopher Grebs <cg@webshox.org> EnTeQuAk <devnull@localhost>
Eric O'Connell <eric.oconnell@idealist.org> eric o'connell <eric.oconnell@idealist.org>
Florian Apolloner <apollo13@apolloner.eu> apollo13 <apollo13@apolloner.eu>
Georg Brandl <georg@python.org> gbrandl <devnull@localhost>