THANKS + mailmap: remove duplicates, fixup full names

diff --git a/.mailmap b/.mailmap
index c296aa04a628e0f1c8e659c531518ad92669dcdd..d9a6e1a9cd289d9101a0fd74d362cbc8d21013a0 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -35,3 +35,8 @@ Jason Juang <jasjuang@gmail.com>
 Carlo Teubner <carlo.teubner@gmail.com>
 Joel Depooter <joel.depooter@safe.com>
 Sebastian Mundry <mundry@outlook.com>
+Rainer Canavan <rainer.canavan@sevenval.com> <canavan@users.noreply.github.com>
+Dan Fandrich <dan@coneharvesters.com>
+Henrik S. Gaßmann <henrik@gassmann.onl>
+Jiří Malák <malak.jiri@gmail.com>
+Nick Zitzmann <nickzman@gmail.com>

diff --git a/docs/THANKS b/docs/THANKS
index 339580d97a0c1d278a81484b594e6263c96f0fd6..58dd67d3d3b4bf120fd86225224513ac8b78eac4 100644 (file)
--- a/docs/THANKS
+++ b/docs/THANKS
@@ -1658,7 +1658,6 @@ arainchik on github
 asavah on github
 baumanj on github
 bsammon on github
-canavan on github
 cbartl on github
 cmfrolick on github
 destman on github