From 880999d5a786a831287378cf4f660e827b6789f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Sat, 1 Feb 2025 12:04:06 +0100
Subject: [PATCH] Add mailmap

---
 .mailmap | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000000..0935c3c5c257
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,16 @@
+Ary Borenszweig <asterite@gmail.com> <aborenszweig@manas.com.ar>
+Ary Borenszweig <asterite@gmail.com> <ary@esperanto.org.ar>
+Ary Borenszweig <asterite@gmail.com> <asterite@gmail.com>
+Brian J. Cardiff <bcardiff@gmail.com> <bcardiff@manas.com.ar>
+Brian J. Cardiff <bcardiff@gmail.com> <bcardiff@manas.tech>
+George Dietrich <george@dietrich.app> <yomoejoe@gmail.com>
+Gustavo Giráldez <ggiraldez@manas.tech> <ggiraldez@manas.com.ar>
+Johannes Müller <straightshoota@gmail.com> <johannes.mueller@smj-fulda.org>
+Juan Wajnerman <juan.wajnerman@gmail.com> <jwajnerman@manas.com.ar>
+Juan Wajnerman <juan.wajnerman@gmail.com> <waj@manas.com.ar>
+Juan Wajnerman <juan.wajnerman@gmail.com> <waj@manas.tech>
+Julien Reichardt <git@jrei.ch> <mi@jrei.ch>
+Martin Verzilli <mverzilli@manas.tech> <mverzilli@manas.com.ar>
+Matías García Isaía <mgarcia@manas.tech> <mgarcia@manas.com.ar>
+Matías García Isaía <mgarcia@manas.tech> <mgarcia@manas.tech>
+Stephanie Hobbs <steph@rx14.co.uk> <chris@rx14.co.uk>