summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Alekseyev <ilyaalekseyev@acm.org>2011-06-25 04:47:06 +0400
committerIlya Alekseyev <ilyaalekseyev@acm.org>2011-06-25 04:47:06 +0400
commitfd3da28b567a66a31f2833a3c00d0b6ccf55eed8 (patch)
tree3c6a99999dacf7e7571a05fe672dfec9f4cd617b
parent584615837f949b4d9d2a99880d03539789467f2c (diff)
mailmap
-rw-r--r--.mailmap2
-rw-r--r--Authors4
2 files changed, 4 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 89094fbbb..6673d0a26 100644
--- a/.mailmap
+++ b/.mailmap
@@ -49,3 +49,5 @@
<vishvananda@gmail.com> <vishvananda@yahoo.com>
<ilyaalekseyev@acm.org> <ialekseev@griddynamics.com>
<ilyaalekseyev@acm.org> <ilya@oscloud.ru>
+<reldan@oscloud.ru> <enugaev@griddynamics.com>
+<kshileev@gmail.com> <kshileev@griddynamics.com> \ No newline at end of file
diff --git a/Authors b/Authors
index 21a9bf94b..c3a65f1b4 100644
--- a/Authors
+++ b/Authors
@@ -22,7 +22,7 @@ David Pravec <David.Pravec@danix.org>
Dean Troyer <dtroyer@gmail.com>
Devin Carlen <devin.carlen@gmail.com>
Ed Leafe <ed@leafe.com>
-Eldar Nugaev <reldan@oscloud.ru> <enugaev@griddynamics.com>
+Eldar Nugaev <reldan@oscloud.ru>
Eric Day <eday@oddments.org>
Eric Windisch <eric@cloudscaling.com>
Ewan Mellor <ewan.mellor@citrix.com>
@@ -53,7 +53,7 @@ Kei Masumoto <masumotok@nttdata.co.jp>
Ken Pepple <ken.pepple@gmail.com>
Kevin Bringard <kbringard@attinteractive.com>
Kevin L. Mitchell <kevin.mitchell@rackspace.com>
-Kirill Shileev <kshileev@gmail.com> <kshileev@griddynamics.com>
+Kirill Shileev <kshileev@gmail.com>
Koji Iida <iida.koji@lab.ntt.co.jp>
Lorin Hochstein <lorin@isi.edu>
Lvov Maxim <usrleon@gmail.com>