Merge branch 'master' into sqlalchemy - solved totally harmless
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 1 Feb 2012 17:38:27 +0000 (18:38 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 1 Feb 2012 17:38:27 +0000 (18:38 +0100)
commit699667b3e734e954b0c93fbb2a6c29d82246d1dd
tree2afef726d24ce7ed8d19eb6a8da0a6cdd6be03cd
parente11df870ed7f3739af715a6b744b96c7b15fd974
parent6d84f7eb25352c50e40950d0585c33bd1193649e
Merge branch 'master' into sqlalchemy - solved totally harmless
conflict in sfa/openstack/openstack_driver.py
sfa/openstack/openstack_driver.py