summaryrefslogtreecommitdiffstats
path: root/Authors
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-06-28 17:05:41 -0500
committerJosh Kearney <josh@jk0.org>2011-06-28 17:05:41 -0500
commitd59e576dfeccdbd7ee82ea2803b57e24dcba2c22 (patch)
treeea8c17a46c7fe9f354e48aa6b9aa754586d13875 /Authors
parentd0ff8a737111e9155fd59816afa5c4fc2b34bb4c (diff)
parent9ae4fbdef0a5f4c925c7e3d546edea06e608e39b (diff)
downloadnova-d59e576dfeccdbd7ee82ea2803b57e24dcba2c22.tar.gz
nova-d59e576dfeccdbd7ee82ea2803b57e24dcba2c22.tar.xz
nova-d59e576dfeccdbd7ee82ea2803b57e24dcba2c22.zip
Merged trunk
Diffstat (limited to 'Authors')
-rw-r--r--Authors5
1 files changed, 3 insertions, 2 deletions
diff --git a/Authors b/Authors
index 94fcf7f5b..c3a65f1b4 100644
--- a/Authors
+++ b/Authors
@@ -22,14 +22,14 @@ David Pravec <David.Pravec@danix.org>
Dean Troyer <dtroyer@gmail.com>
Devin Carlen <devin.carlen@gmail.com>
Ed Leafe <ed@leafe.com>
-Eldar Nugaev <enugaev@griddynamics.com>
+Eldar Nugaev <reldan@oscloud.ru>
Eric Day <eday@oddments.org>
Eric Windisch <eric@cloudscaling.com>
Ewan Mellor <ewan.mellor@citrix.com>
Gabe Westmaas <gabe.westmaas@rackspace.com>
Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Hisaki Ohara <hisaki.ohara@intel.com>
-Ilya Alekseyev <ialekseev@griddynamics.com>
+Ilya Alekseyev <ilyaalekseyev@acm.org>
Isaku Yamahata <yamahata@valinux.co.jp>
Jason Cannavale <jason.cannavale@rackspace.com>
Jason Koelker <jason@koelker.net>
@@ -53,6 +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>
Koji Iida <iida.koji@lab.ntt.co.jp>
Lorin Hochstein <lorin@isi.edu>
Lvov Maxim <usrleon@gmail.com>