aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2012-10-16 10:54:58 -0400
committerW. Trevor King <wking@tremily.us>2012-10-16 10:54:58 -0400
commite842072ab54d1fa39a06ce4443354895fa5915bf (patch)
tree8346b3965d9fc5b7855f29d14d5220f1d059ef7b /.mailmap
parentffdd62df7f16a483454fa2a15a11cb685d9b1c10 (diff)
downloadbugseverywhere-e842072ab54d1fa39a06ce4443354895fa5915bf.tar.gz
.mailmap: consilidate Niall Douglas' addresses.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 899a847..073c2dc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,6 +8,8 @@ Gianluca Montecchi <gian@grys.it> <gian@galactica>
Gianluca Montecchi <gian@grys.it> <gian@li82-39>
Jan Gerber <j@oil21.org>
Marien Zwart <marien.zwart@gmail.com> <marienz@gentoo.org>
+Niall Douglas (s_sourceforge@nedprod.com) <spam@spamtrap.com> <spam@spamtrap.com>
+Niall Douglas (s_sourceforge@nedprod.com) <spam@spamtrap.com> <spamtrap@nowhere>
Tanguy Le Carrour <tanguy.lecarrour@gmail.com>
W. Trevor King <wking@tremily.us> <wking@drexel.edu>
W. Trevor King <wking@tremily.us> <wking@thialfi>