Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorLoic Baron <loic.baron@lip6.fr>
Fri, 23 Aug 2013 09:10:12 +0000 (11:10 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 23 Aug 2013 09:10:12 +0000 (11:10 +0200)
commit129b1502b5188c74f48e82da6c20c3b63350936c
treed0087f7a5cad215e66c3f4e10d924a850a41e4ae
parentf1df689da513b1523ce89f0ba32728592999c1f2
parentaf0331622e9823245720bd576bf4aaeb5343147d
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

Conflicts:
myslice/viewutils.py
myslice/viewutils.py
portal/views.py