From e0416f25485c67ccf35b6c309bbc69128770a27e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20Go=C5=82=C4=99biowski?= <m.goleb@gmail.com>
Date: Wed, 13 Mar 2013 10:44:05 -0400
Subject: [PATCH] =?utf8?q?Authors=20update=20for=20Micha=C5=82=20Go=C5=82?=
 =?utf8?q?=C4=99biowski.=20Add=20.mailmap=20entry=20for=20my=20old=20commi?=
 =?utf8?q?ts=20too.=20Closes=20gh-1201.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .mailmap    | 3 +++
 AUTHORS.txt | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..05b4a1383
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Michał Gołębiowski <m.goleb@gmail.com> <michal.golebiowski@laboratorium.ee>
+Timmy Willison <timmywillisn@gmail.com>
+Timmy Willison <timmywillisn@gmail.com> <tim.willison@thisismedium.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 5bbfb7d5f..aba1f8123 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -163,4 +163,4 @@ Adam Coulombe <me@adam.co>
 Andrew Plummer <plummer.andrew@gmail.com>
 Nguyen Phuc Lam <ruado1987@gmail.com>
 Dmitry Gusev <dmitry.gusev@gmail.com>
-Michał Z. Gołębiowski <michal.golebiowski@laboratorium.ee>
+Michał Gołębiowski <m.goleb@gmail.com>
-- 
2.39.5