From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Fri, 28 Feb 2014 19:08:28 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~256^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ed05804919d39c41003f2eac34d90e345cbf6aa6;p=unfold.git

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

ed05804919d39c41003f2eac34d90e345cbf6aa6