From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 18 Dec 2014 15:31:21 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~6^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=1f3b7916e26ca25055ec54dfdb0131017f0201e3

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

1f3b7916e26ca25055ec54dfdb0131017f0201e3