From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 25 Jul 2014 18:22:38 +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=5ae4f6ec1b8941fc571ca61a396eb72fafe40e1f;p=myslice.git

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

Conflicts:
	portal/homeview.py
---

5ae4f6ec1b8941fc571ca61a396eb72fafe40e1f