diff options
| author | brian-lamar <brian.lamar@gmail.com> | 2011-02-11 11:05:49 -0500 |
|---|---|---|
| committer | brian-lamar <brian.lamar@gmail.com> | 2011-02-11 11:05:49 -0500 |
| commit | 24ad2cc21abbab494a3be18a7f09a6c1d9210804 (patch) | |
| tree | e083ba00f9a48622c8a8a99d6ef79d79c717df98 /nova/exception.py | |
| parent | 590f5f1793c1f829101b4edbacbc79eac7acd2ef (diff) | |
| parent | d6736026aa11a536d1c0f342d89bca063b43b3ff (diff) | |
| download | nova-24ad2cc21abbab494a3be18a7f09a6c1d9210804.tar.gz nova-24ad2cc21abbab494a3be18a7f09a6c1d9210804.tar.xz nova-24ad2cc21abbab494a3be18a7f09a6c1d9210804.zip | |
Merged to trunk and fixed merge conflict in Authors.
Diffstat (limited to 'nova/exception.py')
0 files changed, 0 insertions, 0 deletions