Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Tue, 14 Jan 2014 09:56:45 +0000 (10:56 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 14 Jan 2014 09:56:45 +0000 (10:56 +0100)
1  2 
portal/registrationview.py

Simple merge