From 058c8a6f2eb7d15512199007db8da4d72549a771 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 18 Aug 2017 17:49:20 +0200
Subject: [PATCH] mailmap: de-duplify some git authors

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

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..18cf8a6d8
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,26 @@
+Guenter Knauf <lists@gknw.net> <gk@gknw.de>
+Gisle Vanem <gisle.vanem@gmail.com> <gvanem@yahoo.no>
+Gisle Vanem <gisle.vanem@gmail.com> <gvanem@broadpark.no>
+Alessandro Ghedini <alessandro@ghedini.me> <alessandro@cloudflare.com>
+Alessandro Ghedini <alessandro@ghedini.me> <al3xbio@gmail.com>
+Björn Stenberg <bjorn@haxx.se>
+Björn Stenberg <bjorn@haxx.se> <bjst@bjorn>
+Viktor Szakáts <vszakats@users.noreply.github.com>
+Daniel Gustafsson <daniel@yesql.se> <dgustafsson@pivotal.io>
+Daniel Gustafsson <daniel@yesql.se> <daniel@hobbit.se>
+Linus Nielsen <linus@haxx.se>
+Yamada Yasuharu <yasuharu.yamada@access-company.com>
+Ulion <ulion2002@gmail.com>
+Tim Rühsen <tim.ruehsen@gmx.de>
+Steve Holme <steve_holme@hotmail.com> <steven.holme@cubic.com>
+Claes Jakobsson <claes@surfar.nu> <claes@versed.se>
+Sergei Nikulov <sergey.nikulov@gmail.com> <snikulov@users.noreply.github.com>
+Patrick Monnerat <patrick@monnerat.net> <Patrick.Monnerat@datasphere.ch>
+Patrick Monnerat <patrick@monnerat.net> <patrick.monnerat@dh.com>
+Patrick Monnerat <patrick@monnerat.net> <pm@datasphere.ch>
+Nick Zitzmann <nickzman@gmail.com><nick@chronosnet.com>
+Peter Wu <peter@lekensteyn.nl> <peter_at_lekensteyn.nl>
+David Woodhouse <David.Woodhouse@intel.com> <dwmw2@infradead.org>
+Marcel Raad <Marcel.Raad@teamviewer.com> <raad@teamviewer.com>
+Marcel Raad <Marcel.Raad@teamviewer.com> <MarcelRaad@users.noreply.github.com>
+Marcel Raad <Marcel.Raad@teamviewer.com> <marcelraad@users.sf.net>