From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 23 Jul 2014 16:13:01 +0000 (-0300)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d0e00619b8fe042a1b225fc78a57098ae78b2f4d;p=myslice.git

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

Conflicts:
	portal/registrationview.py
	portal/slicerequestview.py
	ui/topmenu.py
---

d0e00619b8fe042a1b225fc78a57098ae78b2f4d