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