diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-03 13:13:15 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-03 13:13:15 -0600 |
| commit | 05ab132a80877f6600ab3a1d712450e421db5eec (patch) | |
| tree | d1b065ed0325651a9150dc45b6a31693cd734693 /Authors | |
| parent | 953fe68ce9b27322003200c464c121464761d1e2 (diff) | |
| parent | 458bf9682df0514a7f180f1ab1566bb7846cd281 (diff) | |
Merge from trunk, conflict resolution and merge prop fixes
Diffstat (limited to 'Authors')
| -rw-r--r-- | Authors | 3 |
1 files changed, 2 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> @@ -39,6 +39,7 @@ Ken Pepple <ken.pepple@gmail.com> Kevin L. Mitchell <kevin.mitchell@rackspace.com> Koji Iida <iida.koji@lab.ntt.co.jp> Lorin Hochstein <lorin@isi.edu> +Masanori Itoh <itoumsn@nttdata.co.jp> Matt Dietz <matt.dietz@rackspace.com> Michael Gundlach <michael.gundlach@rackspace.com> Monsyne Dragon <mdragon@rackspace.com> |