From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Wed, 11 Jun 2014 17:06:18 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~68
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=299cc74138342ebb5c10409babe39364f989c7b2

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

299cc74138342ebb5c10409babe39364f989c7b2