From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Wed, 17 Dec 2014 15:03:34 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~15
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=22ef84b02c0cbaa741bad1b1fbb04c5a2e93b3de

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

22ef84b02c0cbaa741bad1b1fbb04c5a2e93b3de