Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorRezende <rezende@land.ufrj.br>
Thu, 24 Jul 2014 19:50:27 +0000 (16:50 -0300)
committerRezende <rezende@land.ufrj.br>
Thu, 24 Jul 2014 19:50:27 +0000 (16:50 -0300)
commit30fb08d8e61409fd0d7e88a59057134a59f8e7c8
tree9e06a0dd6ba690a02efad5f3a4dfd859aefa22b5
parentc6df549974f497b603418b2e56c0e5d536e60f58
parent6891134719af440a27636545c3babfcb5ccf3d5c
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/registrationview.py
portal/templates/fibre/fibre_activate_user.html
portal/templates/fibre/fibre_registration_view.html