Merge branch 'master' into sqlalchemy - solved totally harmless
[sfa.git] / sfa / openstack / __init__.py