summaryrefslogtreecommitdiffstats
path: root/Authors
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2011-05-13 16:45:42 +0000
committerChris Behrens <cbehrens@codestud.com>2011-05-13 16:45:42 +0000
commitbe83d7317ee55ae0ef436f09f25beef2eccee5a6 (patch)
tree87d4f53c8bd7c5c4056b131b3fc039ee0740f1d6 /Authors
parent7dc76508d38370f3cf68029fae2ffb7749a580b2 (diff)
parent0805521c79f934ba54f839be64a2c43ed177612d (diff)
Merged trunk
Diffstat (limited to 'Authors')
-rw-r--r--Authors2
1 files changed, 2 insertions, 0 deletions
diff --git a/Authors b/Authors
index 60e1d2dad..8b54240c1 100644
--- a/Authors
+++ b/Authors
@@ -44,12 +44,14 @@ Josh Kearney <josh@jk0.org>
Josh Kleinpeter <josh@kleinpeter.org>
Joshua McKenty <jmckenty@gmail.com>
Justin Santa Barbara <justin@fathomdb.com>
+Justin Shepherd <jshepher@rackspace.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>
+Lvov Maxim <usrleon@gmail.com>
Mark Washenberger <mark.washenberger@rackspace.com>
Masanori Itoh <itoumsn@nttdata.co.jp>
Matt Dietz <matt.dietz@rackspace.com>