.mailmap: consilidate Niall Douglas' addresses.

diff --git a/.mailmap b/.mailmap
index 899a847a433c5a8f587b065e4054915e9be4840d..073c2dc7b841cca30651b1baa1619d63d6acce4d 100644 (file)
--- 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>
 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>
 Tanguy Le Carrour <tanguy.lecarrour@gmail.com>
 W. Trevor King <wking@tremily.us> <wking@drexel.edu>
 W. Trevor King <wking@tremily.us> <wking@thialfi>