Merge remote-tracking branch 'upstream/pull/3121'

[rails.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index d190f25771aca970e9f65cb562e6cb552a772fa9..761478b563baaec90676ac4ae7a9d35edd41e271 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,10 @@
 Andrzej Zaborowski <balrogg@gmail.com> <andrew.zaborowski@intel.com>
 Andy Allan <andy@gravitystorm.co.uk> <gravitystorm@gmail.com> <github@gravitystorm.co.uk>
 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>
 Grant Slater <openstreetmap@firefishy.com> <github@firefishy.com>

-Harry Wood <git@harrywood.co.uk> <mail@harrywood.co.uk>
+Harry Wood <git@harrywood.co.uk> <mail@harrywood.co.uk> <github@onlineanimals.co.uk>

 Kai Krueger <kakrueger@gmail.com> <kai@aiputerlx.(none)>
 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>
 Richard Fairhurst <richard@systemeD.net> <richard@systemed.net>

+Simon Poole <simon@poole.ch> <simon@rails-dev.poole.ch> <simonpoole@users.noreply.github.com>