Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
[myslice.git] / trash / __init__.py