/portal/urls.py: Merge conflict solved
[myslice.git] / debian / copyright
2013-05-03 Thierry Parmentelatfirst attempt at debian packaging