Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 23 Aug 2013 12:37:42 +0000 (14:37 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 23 Aug 2013 12:37:42 +0000 (14:37 +0200)
commitbfaf128417660246d7e5916129886bfbd3a878b0
treec1c9df13b1765658f880b5fa7620e64493e98d43
parentd68dcefd28c832608cdb359a07a8b871cbe612ae
parent8c36730846c0f62a6bc1a18d720931d2b46ae537
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

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