From 236d157efc49650f871333b192e7cd91dd3d933b Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Fri, 26 Feb 2016 15:21:19 +0900
Subject: [PATCH] Add a .mailmap file

Makes the output of git shortlog look better, for example when
running:

 git shortlog -n -c -s

And makes the annotation in git blame look better.

Initial version only includes names that could be found either
in the repository itself or Google searches.

Change-Id: I95a40e0a6d793037371909e1db6faa04c3cf735b
---
 .mailmap | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..498ab26
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+Armin Ronacher <armin.ronacher@active-4.com> mitsuhiko <devnull@localhost>
+Christopher Grebs <cg@webshox.org>           Christopher Grebs <devnull@localhost>
+Christopher Grebs <cg@webshox.org>           EnTeQuAk <devnull@localhost>
+Eric O'Connell <eric.oconnell@idealist.org>  eric o'connell <eric.oconnell@idealist.org>
+Florian Apolloner <apollo13@apolloner.eu>    apollo13 <apollo13@apolloner.eu>
+Georg Brandl <georg@python.org>              gbrandl <devnull@localhost>