From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Wed, 26 Feb 2014 14:00:41 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~292
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=390791d2d43d4636528301ad493c364b244aa1ef;p=unfold.git

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

390791d2d43d4636528301ad493c364b244aa1ef