Merge remote-tracking branch 'upstream/pull/1801'
[rails.git] / .mailmap
index e4c19a34cf5bc39fe643d544de30527476191dc5..29f21fde6f1178be3dd239791da197b071f89b44 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -7,3 +7,4 @@ 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>
+Simon Poole <simon@poole.ch> <simon@rails-dev.poole.ch>