Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Mon, 1 Sep 2014 20:08:40 +0000 (17:08 -0300)
committerRezende & Pedro & Carlos & Raphael <rezende@land.ufrj.br>
Mon, 1 Sep 2014 20:08:40 +0000 (17:08 -0300)
commit36782e4a0fc3872b2d47b3c5dfc81e87450014f9
tree1c9c688a28481a63cb3f255079c57ec18060a2cf
parent87ecc18f2d0ac887d7fc278b7ba9efc27e0392af
parentbddaae13234f2d36f16098b756006e77a2e409f5
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/registrationview.py
portal/actions.py
portal/registrationview.py