Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Fri, 13 Dec 2013 17:38:13 +0000 (18:38 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 13 Dec 2013 17:38:13 +0000 (18:38 +0100)
commitef9e572f3c703640218a44ea7f86aa71805cbcfe
tree207d53f4c32cfab4ddb71faab3d8dac115f74d44
parenta1e452649acd9538b59dbf728dbc7b7ddec96749
parenta394a81997bcf0fc1a543b511d95eb4f9ddf53c8
Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
manifold/manifoldapi.py
manifold/manifoldapi.py
portal/sliceview.py