From 563c4c665bb6b5f74b58d2b2ef762e2b164ee4e9 Mon Sep 17 00:00:00 2001
From: pyllyukko <pyllyukko@maimed.org>
Date: Tue, 4 Apr 2017 17:54:50 +0300
Subject: [PATCH] Added .mailmap

---
 .mailmap | 2 ++
 Makefile | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..d0975675
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+CHEF-KOCH <CHEF-KOCH@users.noreply.github.com> <Nvinside@gmail.com>
+Francois Marier <francois@mozilla.com> <francois@debian.org>
diff --git a/Makefile b/Makefile
index a465e5b5..364a8e36 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,5 @@ cleanup: sourceprefs.js
 
 authors:
 	@# generate an AUTHORS file, ordered by number of commits
-	@# TODO: add a .mailmap file to deduplicate authors with multiple email addresses
 	@# to add extra authors/credits, git commit --allow-empty --author="A U Thor <author@example.com>"
 	@git shortlog -sne | cut -f1 --complement >| AUTHORS