From 6c9a82cee69dc7325aa55ff0e8acabd8499d63a7 Mon Sep 17 00:00:00 2001
From: Germap <gcarrillo@linuxmail.org>
Date: Thu, 7 Dec 2023 17:45:37 -0500
Subject: [PATCH] =?UTF-8?q?Update=20.mailmap=20with=20preferred=20e-mails?=
 =?UTF-8?q?=20for=20R=C3=A9gis=20H.=20and=20Tom=20C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.mailmap b/.mailmap
index fc25bd41938..8b74b19bf43 100644
--- a/.mailmap
+++ b/.mailmap
@@ -167,7 +167,8 @@ Radim Blazek <radim.blazek@gmail.com> <rblazek@c8812cc2-4d05-0410-92ff-de0c093fc
 
 Raymond Nijssen <r.nijssen@terglobo.nl> raymondnijssen <r.nijssen@terglobo.nl>
 
-Régis Haubourg <regis.haubourg@eau-adour-garonne.fr> Régis Haubourg <regis.haubourg@oslandia.com>
+Régis Haubourg <regis@qgis.org> <regis.haubourg@eau-adour-garonne.fr>
+Régis Haubourg <regis@qgis.org> <regis.haubourg@oslandia.com>
 
 Richard Duivenvoorde <richard@duif.net> rduivenvoorde <rduivenvoorde@c8812cc2-4d05-0410-92ff-de0c093fc19c>
 Richard Duivenvoorde <richard@duif.net> <rdmailings@duif.net>
@@ -195,7 +196,8 @@ Thomas Gratier <thomas_gratier@yahoo.fr> ThomasG77 <thomas_gratier@yahoo.fr>
 Tim Sutton <tim@linfiniti.com> <tim@kartoza.com>
 Tim Sutton <tim@linfiniti.com> <timlinux@c8812cc2-4d05-0410-92ff-de0c093fc19c>
 
-Tom Chadwin <tom.chadwin@nnpa.org.uk> <tomchadwin@users.noreply.github.com>
+Tom Chadwin <tomchadwin@astuntechnology.com> <tom.chadwin@nnpa.org.uk>
+Tom Chadwin <tomchadwin@astuntechnology.com> <tomchadwin@users.noreply.github.com>
 
 Tomas Mizera <tomas.mizera@lutraconsulting.co.uk> tomasMizera <tomas.mizera2@gmail.com>
 Tomas Mizera <tomas.mizera@lutraconsulting.co.uk> <tomas.mizera2@gmail.com>