Merge branch 'master' into newnames
[myslice.git] / portal / __init__.py