From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 1 Jul 2014 09:30:36 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~60^2~19
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9d4a0883ee7e5bc5cf5b990c400ddf573ef9937c;p=myslice.git

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

9d4a0883ee7e5bc5cf5b990c400ddf573ef9937c