diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-05-25 16:58:40 -0400 |
|---|---|---|
| committer | Alex Meade <alex.meade@rackspace.com> | 2011-05-25 16:58:40 -0400 |
| commit | 60d78fb3962e5bdd5f642a8982f53656bda20314 (patch) | |
| tree | 3304e10313ab78a0e28a2c2762888938394fd2c4 /nova/crypto.py | |
| parent | 9d118de526c3b4b190b543c0bd838df6ce175d1c (diff) | |
| parent | ec0e674ce1a8539143e9b99deb8cc62b9d42d6b2 (diff) | |
| download | nova-60d78fb3962e5bdd5f642a8982f53656bda20314.tar.gz nova-60d78fb3962e5bdd5f642a8982f53656bda20314.tar.xz nova-60d78fb3962e5bdd5f642a8982f53656bda20314.zip | |
Merged trunk and resolved conflicts
Diffstat (limited to 'nova/crypto.py')
0 files changed, 0 insertions, 0 deletions