diff options
| author | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-03 15:50:34 +0000 |
|---|---|---|
| committer | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-03 15:50:34 +0000 |
| commit | 9d2ee1b26196efe855d298639561ca69fb96e2cc (patch) | |
| tree | b8283238588ec106c680c074b9650b8b4d93496e /Authors | |
| parent | 6797c5acc47fb5111ef821d6b074cb635692a9fb (diff) | |
| parent | 90e8072df434621a364763f1c7cae0ac0159d630 (diff) | |
Remerged trunk, fixed a few conflicts.
Diffstat (limited to 'Authors')
| -rw-r--r-- | Authors | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,7 @@ John Dewey <john@dewey.ws> Jonathan Bryce <jbryce@jbryce.com> Jordan Rinke <jordan@openstack.org> Josh Durgin <joshd@hq.newdream.net> -Josh Kearney <josh.kearney@rackspace.com> +Josh Kearney <josh@jk0.org> Joshua McKenty <jmckenty@gmail.com> Justin Santa Barbara <justin@fathomdb.com> Kei Masumoto <masumotok@nttdata.co.jp> |