Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 18 Oct 2013 15:42:45 +0000 (17:42 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 18 Oct 2013 15:42:45 +0000 (17:42 +0200)
1  2 
portal/registrationview.py

Simple merge