From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 21 Feb 2014 16:04:08 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~318^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f0fea081b21d77ba379b23a9344881ecd2f37e59;p=unfold.git

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

f0fea081b21d77ba379b23a9344881ecd2f37e59