From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 10 Mar 2014 17:39:20 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~208
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c79b3c894ec8a08686ae4978e5375c15ec6f2cbf;hp=c79b3c894ec8a08686ae4978e5375c15ec6f2cbf;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
	portal/static/js/myslice.js
---