diff options
| author | Ed Leafe <ed@leafe.com> | 2011-08-08 20:12:35 +0000 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-08-08 20:12:35 +0000 |
| commit | 3f23c79bbb556cf05f7cf8c839edb6398464e051 (patch) | |
| tree | cbb950396c2d103f079988c2cd5e2f5203e6d34e /nova/openstack | |
| parent | 8f6b59f0a12a60ef7e45607d9dbcb8bf1c707297 (diff) | |
Cleaned up merge messes.
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions