diff options
| author | Lvov Maxim <usrleon@gmail.com> | 2011-07-26 09:50:05 +0400 |
|---|---|---|
| committer | Lvov Maxim <usrleon@gmail.com> | 2011-07-26 09:50:05 +0400 |
| commit | 01409c0553eaa80c6f31ddc56e9a22054175fa0e (patch) | |
| tree | 9b7d79d81da5fb34074daf5e58eb90f50ba35c20 /nova/context.py | |
| parent | 88ee72fbb50b5f7ead636ef65933489b0e099c2b (diff) | |
| parent | 83033f69e19832dc50fccf5b833189f0c4e8de63 (diff) | |
| download | nova-01409c0553eaa80c6f31ddc56e9a22054175fa0e.tar.gz nova-01409c0553eaa80c6f31ddc56e9a22054175fa0e.tar.xz nova-01409c0553eaa80c6f31ddc56e9a22054175fa0e.zip | |
merge with trunk, resolve conflicts
Diffstat (limited to 'nova/context.py')
0 files changed, 0 insertions, 0 deletions