From: Rezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Date: Tue, 14 Jul 2015 18:26:50 +0000 (-0300)
Subject: Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=refs%2Fheads%2Ffibre

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

Conflicts:
	portal/homeview.py
---

bb98f1e7f4d1d2692b0405377c8f7c7466d72aee