maint: remove duplicate names from THANKS

* .mailmap: Merge email addresses
* THANKS.in: Remove a duplicate name
Reported by Stefano Lattarini

diff --git a/.mailmap b/.mailmap
index e3d7a2701a967fc0928562e64c838c022e943cf7..8b6231763b2888564a2a3dbaef173dbc6fac5527 100644 (file)
--- 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 3019f4f4c96c653e702f8f0ddfde645ef720ef73..a7ec93308d9307b7b7ce5333f7460a896b8017f4 100644 (file)
--- 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