Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Fri, 25 Oct 2013 17:22:40 +0000 (19:22 +0200)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Fri, 25 Oct 2013 17:22:40 +0000 (19:22 +0200)
commita1334d41a53aec4a8bf2ebd7f3c67244eb8ac1a8
tree8fc005038e7f916cb1c9ef230e3d7bac5a3eb9a6
parent292bfa660615de1d3a4e3c6ed0b8a28c84963f88
parent0c8a634162f3271018102e75a3934c5db5e48f59
Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
portal/sliceview.py
plugins/slicestat/__init__.py
plugins/slicestat/static/js/slicestat.js
portal/sliceview.py