From f0e8f13ead3dafce2b776d4ee11321d737216ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Fri, 17 Jun 2011 22:48:22 +0100
Subject: [PATCH] maint: remove duplicate names from THANKS

* .mailmap: Merge email addresses
* THANKS.in: Remove a duplicate name
Reported by Stefano Lattarini
---
 .mailmap  | 2 ++
 THANKS.in | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index e3d7a2701..8b6231763 100644
--- a/.mailmap
+++ b/.mailmap
@@ -23,6 +23,8 @@ Pádraig Brady <p@draigBrady.com> <P@draigBrady.com>
 <jrv@debian.org> <jrvz@comcast.net>
 <dave.anglin@nrc.ca> <dave@hiauly1.hia.nrc.ca>
 <psfales@alcatel-lucent.com> <psfales@lucent.com>
+<karl@gnu.org> <karl@freefriends.org>
+<stephane.raimbault@gmail.com> <stephane.raimbault@makina-corpus.com>
 
 # Prefer spelled-out middle name and its address.
 Arne Henrik Juul <arnej@imf.unit.no> Arne H. Juul <arnej@solan.unit.no>
diff --git a/THANKS.in b/THANKS.in
index 3019f4f4c..a7ec93308 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -313,7 +313,6 @@ Kai-Uwe Rommel                      rommel@informatik.tu-muenchen.de
 Kalle Olavi Niemitalo               kon@iki.fi
 Kamal Paul Nigam                    Kamal_Paul_Nigam@gs35.sp.cs.cmu.edu
 Karl Eichwalder                     keichwa@gmx.net
-Karl Heuer                          kwzh@gnu.org
 Karl-Michael Schneider              schneide@phil.uni-passau.de
 Karsten Thygesen                    karthy@kom.auc.dk
 Kaveh R. Ghazi                      ghazi@caip.rutgers.edu