From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Mon, 3 Mar 2014 18:56:44 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~247
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=24a336b98fadc85337a425af7e54f3c0019244a4;p=unfold.git

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

24a336b98fadc85337a425af7e54f3c0019244a4