From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Wed, 26 Feb 2014 15:03:28 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~290
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=90f648f5b7dc61027598c5ad7dbbea05b6de381c;p=myslice.git

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

90f648f5b7dc61027598c5ad7dbbea05b6de381c