From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 7 Aug 2014 19:03:29 +0000 (-0300)
Subject: Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2a446c0475392bcf26121e3f187fd327190c0a1a;p=myslice.git

Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
	portal/templates/fibre/fibre_registration_view.html
	portal/templates/fibre/fibre_user_register_complete.html
---

2a446c0475392bcf26121e3f187fd327190c0a1a