Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Fri, 10 Jan 2014 17:44:33 +0000 (18:44 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 10 Jan 2014 17:44:33 +0000 (18:44 +0100)
1  2 
portal/registrationview.py

Simple merge