From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Fri, 3 Oct 2014 14:01:06 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.2~1^2~19
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=2aad9db1ebedd8291797872e13c77f5ebe81157e

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

2aad9db1ebedd8291797872e13c77f5ebe81157e