From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 28 Apr 2015 14:44:46 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.4~32
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=00446adb7d1cd10387002c24cf1fa267fe655d28

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

00446adb7d1cd10387002c24cf1fa267fe655d28