merge
authorLoic Baron <loic.baron@lip6.fr>
Tue, 17 Mar 2015 13:37:06 +0000 (14:37 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 17 Mar 2015 13:37:06 +0000 (14:37 +0100)
1  2 
portal/registrationview.py

Simple merge