/portal/urls.py: Merge conflict solved
[myslice.git] / plugins / senslabmap / senslabmap.py
2013-04-05 Thierry Parmentelatrough, untested, port of SensLabMap