From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 17 Jun 2014 13:52:40 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~64^2~10^2
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=147918f7fc73743e7665abcbfb376027d5d414f3

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

147918f7fc73743e7665abcbfb376027d5d414f3