diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-05-09 19:25:02 +0900 |
|---|---|---|
| committer | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-05-09 19:25:02 +0900 |
| commit | db148f108dfc4829e1302a54fe4f57ab81212786 (patch) | |
| tree | f10ee3f5ea4f7ebe7145b5b48abe2c716825047b /nova/api | |
| parent | 03c735bb186a44d80a9d595e00e9c06fd8f709cc (diff) | |
fix mismerge by 1059
Diffstat (limited to 'nova/api')
0 files changed, 0 insertions, 0 deletions