From 723dc8fbcb1a4609c264758eae420ee2811a2b55 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <Vincent Ambo>
Date: Sat, 11 Jan 2020 23:30:06 +0000
Subject: Squashed 'third_party/cgit/' content from commit 8fc0c81

git-subtree-dir: third_party/cgit
git-subtree-split: 8fc0c81bbbed21ee30e8a48b2ab1066a029b7b32
---
 .mailmap | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .mailmap

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000000..03b54796cf83
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,10 @@
+Florian Pritz <bluewind@xinu.at> <bluewind@xssn.at>
+Harley Laue <losinggeneration@gmail.com> <losinggeneration@aim.com>
+John Keeping <john@keeping.me.uk> <john@metanate.com>
+Lars Hjemli <hjemli@gmail.com> <larsh@hal-2004.(none)>
+Lars Hjemli <hjemli@gmail.com> <larsh@hatman.(none)>
+Lars Hjemli <hjemli@gmail.com> <larsh@slackbox.hjemli.net>
+Lars Hjemli <hjemli@gmail.com> <larsh@slaptop.hjemli.net>
+Lukas Fleischer <lfleischer@lfos.de> <cgit@cryptocrack.de>
+Lukas Fleischer <lfleischer@lfos.de> <info@cryptocrack.de>
+Stefan Bühler <source@stbuehler.de> <lighttpd@stbuehler.de>
-- 
cgit 1.4.1