Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 11 Oct 2013 19:24:51 +0000 (21:24 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 11 Oct 2013 19:24:51 +0000 (21:24 +0200)
commit9961edb421c6156048be5688d249047daf250e70
tree122110f10b87c72b23eb3ca19de652a1c7d9a87f
parent3cbd1a536e44bed0fecce6a7d0be57b2c6d03748
parent5a98d2bbf3603206e4574783633342ddcbbd4943
Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
portal/urls.py