diff options
| author | Andy Smith <code@term.ie> | 2011-01-18 14:55:03 -0800 |
|---|---|---|
| committer | Andy Smith <code@term.ie> | 2011-01-18 14:55:03 -0800 |
| commit | 453436bdbdb5c7f5ee9b0e6340fa913017b8e226 (patch) | |
| tree | d4a1760583207775101c4b1284514551da183842 /nova/utils.py | |
| parent | 18773e2aa53329511649fed5cdf37f5a80008f5c (diff) | |
| parent | 5b496ed35c53869623e4a968ab9d310089f3bfb2 (diff) | |
| download | nova-453436bdbdb5c7f5ee9b0e6340fa913017b8e226.tar.gz nova-453436bdbdb5c7f5ee9b0e6340fa913017b8e226.tar.xz nova-453436bdbdb5c7f5ee9b0e6340fa913017b8e226.zip | |
merge from upstream to fix conflict
Diffstat (limited to 'nova/utils.py')
0 files changed, 0 insertions, 0 deletions