Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Thu, 20 Feb 2014 16:09:48 +0000 (17:09 +0100)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Thu, 20 Feb 2014 16:09:48 +0000 (17:09 +0100)
commit3d16aa36af64e8e0e5ce3a48c34df158fbfaae29
treeb6bb1bfe4ed0661ff3cc10d830f736c6e1721a95
parenta7337c66c2c7c3312c4205a8119252f04a1fbd58
parent7482d3153a0034a91c0f7eaa490b62adc1554e9c
Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
portal/slicerequestview.py
portal/usersview.py
portal/accountview.py
portal/manageuserview.py
portal/slicerequestview.py
portal/usersview.py