Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
authorBruno Soares da Silva <brunosoares.inf@gmail.com>
Tue, 16 Sep 2014 21:47:39 +0000 (18:47 -0300)
committerBruno Soares da Silva <brunosoares.inf@gmail.com>
Tue, 16 Sep 2014 21:47:39 +0000 (18:47 -0300)
commit43a4dfd5c95080af83cc2ccf2c7d75218e985e57
tree85e61eb3f39e346953eabd265a1d06185ecb9fac
parent5c5d6689dc9c7d0fda4fae3ceb14a8c738a7cfa2
parentd1accda30ea287adde0500b5280ee360e1c357a3
Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/actions.py
portal/lsapiclient.py
portal/actions.py
portal/lsapiclient.py