Merge branch 'geni-v3' into pep8
[sfa.git] / sfa / trust / __init__.py