Merge branch 'master' of git://git.onelab.eu/myslice
authorLoic Baron <loic.baron@lip6.fr>
Thu, 26 Sep 2013 10:10:16 +0000 (12:10 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 26 Sep 2013 10:10:16 +0000 (12:10 +0200)
Conflicts:
portal/templates/registration_view.html


No differences found