From: Tom Hughes <tom@compton.nu>
Date: Sat, 27 Jun 2015 23:14:07 +0000 (+0100)
Subject: Update mailmap
X-Git-Tag: live~5167
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/785bf2bfe12b29c751f69e7ebf2cec2f474f199b?hp=601f1609ab112b8fea55124dd6c04b3964992759

Update mailmap
---

diff --git a/.mailmap b/.mailmap
index 683907698..c576a560f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,8 @@
 Andrzej Zaborowski <balrogg@gmail.com> <andrew.zaborowski@intel.com>
 Andy Allan <andy@gravitystorm.co.uk> <gravitystorm@gmail.com> <github@gravitystorm.co.uk>
+Florian Schäfer <florian@schaeferban.de>
 Grant Slater <openstreetmap@firefishy.com> <github@firefishy.com>
 Harry Wood <git@harrywood.co.uk> <mail@harrywood.co.uk> <github@onlineanimals.co.uk>
 Kai Krueger <kakrueger@gmail.com> <kai@aiputerlx.(none)>
+Michael Glanznig <nebulon42@yandex.com>
 Richard Fairhurst <richard@systemeD.net> <richard@systemed.net>