From e842072ab54d1fa39a06ce4443354895fa5915bf Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Tue, 16 Oct 2012 10:54:58 -0400
Subject: [PATCH] .mailmap: consilidate Niall Douglas' addresses.

---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

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>
-- 
2.26.2