Merge from trunk. Fixed conflict in Authors file again.

This commit is contained in:
Naveed Massjouni
2011-02-28 19:46:39 -05:00
14 changed files with 705 additions and 189 deletions

View File

@@ -47,6 +47,7 @@ MORITA Kazutaka <morita.kazutaka@gmail.com>
Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Naveed Massjouni <naveedm9@gmail.com>
Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
Paul Voccio <paul@openstack.org>
Ricardo Carrillo Cruz <emaildericky@gmail.com>
Rick Clark <rick@openstack.org>