Merge commit 'origin/master'
[sfa.git] / sfa / managers / __init__.py