From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 26 Sep 2013 10:16:07 +0000 (+0200)
Subject: Merge branch 'master' of git://git.onelab.eu/myslice
X-Git-Tag: myslice-0.2-5~85^2~7^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=15ca59cb1f80be244df33026add2cf97f2f87a62

Merge branch 'master' of git://git.onelab.eu/myslice

Conflicts:
	portal/registrationview.py
---

15ca59cb1f80be244df33026add2cf97f2f87a62