summaryrefslogtreecommitdiffstats
path: root/Authors
diff options
context:
space:
mode:
authorWilliam Wolf <throughnothing@gmail.com>2011-05-02 18:07:30 -0400
committerWilliam Wolf <throughnothing@gmail.com>2011-05-02 18:07:30 -0400
commit64ebfab4cf8279a7ad8ffefebd6bc207aecb3122 (patch)
treeb49ecc53a5eee13c7458db393915eed3139711a8 /Authors
parentf99c5f60d202e84f5defb63e771f60d20cf43df9 (diff)
parentc069337734e99d5833b5a1814e33ffb1fbb5fff6 (diff)
merge updates from trunk
Diffstat (limited to 'Authors')
-rw-r--r--Authors2
1 files changed, 2 insertions, 0 deletions
diff --git a/Authors b/Authors
index c440d3c11..1cdeeff99 100644
--- a/Authors
+++ b/Authors
@@ -1,3 +1,4 @@
+Alex Meade <alex.meade@rackspace.com>
Andy Smith <code@term.ie>
Andy Southgate <andy.southgate@citrix.com>
Anne Gentle <anne@openstack.org>
@@ -45,6 +46,7 @@ Joshua McKenty <jmckenty@gmail.com>
Justin Santa Barbara <justin@fathomdb.com>
Kei Masumoto <masumotok@nttdata.co.jp>
Ken Pepple <ken.pepple@gmail.com>
+Kevin Bringard <kbringard@attinteractive.com>
Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Koji Iida <iida.koji@lab.ntt.co.jp>
Lorin Hochstein <lorin@isi.edu>