Merging trunk

This commit is contained in:
Rick Harris
2010-12-30 11:26:21 -06:00
4 changed files with 7 additions and 1 deletions

View File

@@ -27,4 +27,6 @@
<vishvananda@gmail.com> <root@ubuntu>
<sleepsonthefloor@gmail.com> <root@tonbuntu>
<rlane@wikimedia.org> <laner@controller>
<rick.harris@rackspace.com> <rconradharris@gmail.com>
<rconradharris@gmail.com> <rick.harris@rackspace.com>
<corywright@gmail.com> <cory.wright@rackspace.com>
<ant@openstack.org> <amesserl@rackspace.com>