From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Fri, 25 Jul 2014 15:44:35 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~38^2~1
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=e71aad493c1d1d2c4a275f1f138932f605461a41

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

e71aad493c1d1d2c4a275f1f138932f605461a41