Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 28 Aug 2013 08:42:11 +0000 (10:42 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 28 Aug 2013 08:42:11 +0000 (10:42 +0200)
commitd7fd4a2f12d405812f6a0de5c1a3625d9affe701
treead47b004cc8f47cea4108304383601149d8e85de
parent26d84333b968352f844b47740021dd2a2fcafa41
parente9783ab5c646425813009e2e7174fb4f53d9d881
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

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