Merge branch 'upstreammaster'
[sfa.git] / sfa / rspecs / resources / __init__.py