Merge branch 'master' into sqlalchemy
[sfa.git] / sfa / storage / __init__.py