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