summaryrefslogtreecommitdiffstats
path: root/Authors
diff options
context:
space:
mode:
authorChuck Short <zulcss@ubuntu.com>2011-03-02 10:55:12 -0500
committerChuck Short <zulcss@ubuntu.com>2011-03-02 10:55:12 -0500
commit50d0bcdfd689408fab9e387faaf9d5b57c4c7139 (patch)
treefee34b875a54234b026f10e3b2f8c19116961ee5 /Authors
parent031205a26ae6fe906a47eefa716bbd575687c479 (diff)
parentbb7c1b8c63632c789ed0cd3785a22b7baa90fd83 (diff)
Merge trunk
Diffstat (limited to 'Authors')
-rw-r--r--Authors3
1 files changed, 2 insertions, 1 deletions
diff --git a/Authors b/Authors
index a3c06dcf5..9d1843508 100644
--- a/Authors
+++ b/Authors
@@ -46,7 +46,8 @@ Monty Taylor <mordred@inaugust.com>
MORITA Kazutaka <morita.kazutaka@gmail.com>
Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
-Naveed Massjouni <naveed.massjouni@rackspace.com>
+Naveed Massjouni <naveedm9@gmail.com>
+Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
Paul Voccio <paul@openstack.org>
Ricardo Carrillo Cruz <emaildericky@gmail.com>
Rick Clark <rick@openstack.org>