From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 6 May 2014 15:40:18 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~119
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4078daa9ed64dd8266455484d8e037098c7a9504;p=unfold.git

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

4078daa9ed64dd8266455484d8e037098c7a9504