diff options
| author | Ewan Mellor <ewan.mellor@citrix.com> | 2010-08-04 11:32:43 +0100 |
|---|---|---|
| committer | Ewan Mellor <ewan.mellor@citrix.com> | 2010-08-04 11:32:43 +0100 |
| commit | 570dffd7168d73d7a550b4fa4573532d3fe19294 (patch) | |
| tree | 1f1cc981626be148645f80157dc6ae1948ec4967 /bin | |
| parent | 24d5113636a92df386fa076cc89cea5b1c8b2580 (diff) | |
| parent | 490a97783b97c5753692099c4d7f609e29a8f74e (diff) | |
Merge lp:~vishvananda/nova/fix-curl-project, fix conflicts with changes
to images.image_url, and add the same fix to xenapi.
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions