summaryrefslogtreecommitdiffstats
path: root/Authors
diff options
context:
space:
mode:
authorNaveed Massjouni <naveedm9@gmail.com>2011-09-08 13:44:37 -0400
committerNaveed Massjouni <naveedm9@gmail.com>2011-09-08 13:44:37 -0400
commit236cbc0c13deaef69daba38e83cc7c294ea0bac2 (patch)
tree8f6a482ad293d698fbbf3abbe95339f208b24157 /Authors
parentd155f4224cb97e43cacd4102ba01f0e1775dfbdf (diff)
parentbb3b61b61dc4b45fba4bdab7ead69af239eac40a (diff)
Merge from trunk
Diffstat (limited to 'Authors')
-rw-r--r--Authors2
1 files changed, 2 insertions, 0 deletions
diff --git a/Authors b/Authors
index b9e7a7d23..a6598103f 100644
--- a/Authors
+++ b/Authors
@@ -11,6 +11,7 @@ Antony Messerli <ant@openstack.org>
Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Arvind Somya <asomya@cisco.com>
Bilal Akhtar <bilalakhtar@ubuntu.com>
+Brad Hall <brad@nicira.com>
Brian Lamar <brian.lamar@rackspace.com>
Brian Schott <bschott@isi.edu>
Brian Waldon <brian.waldon@rackspace.com>
@@ -30,6 +31,7 @@ Devendra Modium <dmodium@isi.edu>
Devin Carlen <devin.carlen@gmail.com>
Donal Lafferty <donal.lafferty@citrix.com>
Ed Leafe <ed@leafe.com>
+Edouard Thuleau <thuleau@gmail.com>
Eldar Nugaev <reldan@oscloud.ru>
Eric Day <eday@oddments.org>
Eric Windisch <eric@cloudscaling.com>