From 414e7774a961d08bbb5df4900ef91df8cd615026 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Wed, 12 Sep 2012 12:06:30 +0200
Subject: [PATCH] Add .mailmap for mapping of git Author tags belonging to the
 same person

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

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..15d8f359
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Kristian Klette <klette@samfundet.no>
+Johannes Knutsen <johannes@knutseninfo.no> <johannes@iterate.no>
+Johannes Knutsen <johannes@knutseninfo.no> <johannes@barbarmaclin.(none)>
+John Bäckstrand <sopues@gmail.com> <sandos@XBMCLive.(none)>