From: Rezende & Pedro & Carlos & Raphael Date: Mon, 1 Sep 2014 20:08:40 +0000 (-0300) Subject: Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=36782e4a0fc3872b2d47b3c5dfc81e87450014f9 Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre Conflicts: portal/registrationview.py --- 36782e4a0fc3872b2d47b3c5dfc81e87450014f9