Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorLoic Baron <loic.baron@lip6.fr>
Fri, 23 Aug 2013 13:10:39 +0000 (15:10 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 23 Aug 2013 13:10:39 +0000 (15:10 +0200)
commitc381d920d9a359eab2b11cb15e88ab1f4e55a82e
tree2201da05da8431cd2598723495804908c432849f
parent92422ec1289e2144667d593c0ad22c062f10008b
parentbfaf128417660246d7e5916129886bfbd3a878b0
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

Conflicts:
portal/urls.py
portal/urls.py
portal/views.py