Merge remote-tracking branch 'openstreetmap/pull/1439'

[rails.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 683907698555809120a3c8c01492d2171cd67690..e4c19a34cf5bc39fe643d544de30527476191dc5 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,9 @@
 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>
+Petr Kadlec <mormegil@centrum.cz>
 Richard Fairhurst <richard@systemeD.net> <richard@systemed.net>