summaryrefslogtreecommitdiffstats
path: root/doc/source
diff options
context:
space:
mode:
authorEwan Mellor <ewan.mellor@citrix.com>2010-07-29 00:58:33 +0100
committerEwan Mellor <ewan.mellor@citrix.com>2010-07-29 00:58:33 +0100
commit04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc (patch)
tree6bcdfafed1cb2332ebd8b7c0d03b4fed4a82520e /doc/source
parent9f4996e8738991a95a23cba2caa660f7002f94cd (diff)
downloadnova-04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc.tar.gz
nova-04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc.tar.xz
nova-04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc.zip
More merges from trunk. Not everything came over the first time.
Diffstat (limited to 'doc/source')
0 files changed, 0 insertions, 0 deletions