From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Wed, 26 Feb 2014 18:30:53 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~284^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6641afdf27f01adce9117bd93d88a59143642c5b;p=unfold.git

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

6641afdf27f01adce9117bd93d88a59143642c5b