From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 20 Feb 2015 10:54:22 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~88
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=48478f20e4ee665d8d02b3caea9acf4a785be030

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

48478f20e4ee665d8d02b3caea9acf4a785be030