Merge branch 'master' into exp2
[sfa.git] / sfa / rspecs / resources / __init__.py