diff options
| author | Naveed Massjouni <naveedm9@gmail.com> | 2011-02-28 19:46:39 -0500 |
|---|---|---|
| committer | Naveed Massjouni <naveedm9@gmail.com> | 2011-02-28 19:46:39 -0500 |
| commit | 7482055a1a7115d449f330a5069d59df977bb269 (patch) | |
| tree | 29490bf424bb7a121b03221d9b936e10bab2e847 /nova/utils.py | |
| parent | f61718cc1f9dd9c65d389de8dfc3ca4dd54f8436 (diff) | |
| parent | 78bd53a44a529f0c6641357fa001d4d037fbc375 (diff) | |
| download | nova-7482055a1a7115d449f330a5069d59df977bb269.tar.gz nova-7482055a1a7115d449f330a5069d59df977bb269.tar.xz nova-7482055a1a7115d449f330a5069d59df977bb269.zip | |
Merge from trunk. Fixed conflict in Authors file again.
Diffstat (limited to 'nova/utils.py')
0 files changed, 0 insertions, 0 deletions