summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2014-02-25 22:08:10 -0500
committerDonald Stufft <donald@stufft.io>2014-02-26 13:28:48 -0500
commite87f4bf3d26733560b10bdaddbfe61419d59c6b1 (patch)
treebd24b6f9079dc50f8bd4de69ba5ba064e15e62b0 /.mailmap
parent9dcdbb548fcf2e083e5ef20dfb52396c1b178e9b (diff)
downloadpip-e87f4bf3d26733560b10bdaddbfe61419d59c6b1.tar.gz
Switch to using Author <email@domain.com> for the AUTHORS file
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap10
1 files changed, 8 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index aab17a9ba..73928a700 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,10 +1,13 @@
Adam Wentz <awentz@theonion.com>
-Alex Grönholm <alex.gronholm+git@nextday.fi> <alex.gronholm@nextday.fi>
+Alex Grönholm <alex.gronholm@nextday.fi>
+Alex Grönholm <alex.gronholm@nextday.fi> <alex.gronholm+git@nextday.fi>
Anatoly Techtonik <techtonik@gmail.com>
Andrey Bulgakov <mail@andreiko.ru>
+ <mail@andreiko.ru> <bulgakov@tranio.ru>
Andrei Geacar <andrei.geacar@gmail.com> unknown <hakaton@Anam-mbl.(none)>
Ben Rosser <rosser.bjr@gmail.com>
- <carl@dirtcircle.com> <carl@oddbird.net>
+ <bradley.ayers@gmail.com> <bradley.ayers@enigmainteractive.com>
+ <carl@oddbird.net> <carl@dirtcircle.com>
Daniel Holth <dholth@fastmail.fm>
<donald@stufft.io> <donald.stufft@gmail.com>
Endoh Takanao <djmchl@gmail.com>
@@ -16,10 +19,13 @@ Ilya Baryshev <baryshev@gmail.com>
Jakub Stasiak <kuba.stasiak@gmail.com>
John-Scott Atlakson <john.scott.atlakson@gmail.com>
Jorge Niedbalski <niedbalski@gmail.com>
+ <niedbalski@gmail.com> <jorge@nimbic.com>
Markus Hametner <fin+github@xbhd.org>
Masklinn <bitbucket.org@masklinn.net>
+ <pnasrat@gmail.com> <pnasrat@googlemail.com>
Preston Holmes <preston@ptone.com>
Przemek Wrzos <hetmankp@none>
+ <hodgestar@gmail.com> <hodgestar+hg@gmail.com>
Thomas Johansson <devnull@localhost> prencher <devnull@localhost>
Yoval P <yoval@gmx.com>
Zhiping Deng <kofreestyler@gmail.com>