diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2010-12-09 10:22:50 -0400 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2010-12-09 10:22:50 -0400 |
| commit | e6079449dc034234dc24e77b94bbcc4a257387d9 (patch) | |
| tree | df2d66c6c03d328069f4a8524dbaa897afd65f81 /Authors | |
| parent | f0b53131569cd409a95c68b435ec56a69dcdc897 (diff) | |
| parent | 3c114a7dd596dfb12de42577711d97d1a98d10ec (diff) | |
Fixed Authors conflict and re-merged with trunk
Diffstat (limited to 'Authors')
| -rw-r--r-- | Authors | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -20,9 +20,11 @@ Michael Gundlach <michael.gundlach@rackspace.com> Monty Taylor <mordred@inaugust.com> Paul Voccio <paul@openstack.org> Rick Clark <rick@openstack.org> +Ryan Lucio <rlucio@internap.com> Sandy Walsh <sandy.walsh@rackspace.com> Soren Hansen <soren.hansen@rackspace.com> Todd Willey <todd@ansolabs.com> +Trey Morris <trey.morris@rackspace.com> Vishvananda Ishaya <vishvananda@gmail.com> Youcef Laribi <Youcef.Laribi@eu.citrix.com> Zhixue Wu <Zhixue.Wu@citrix.com> |