From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 6 Oct 2014 13:18:46 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.2~1^2~17
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=1f8c2c50c3810598d61659dd7b1a238ef4def369

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

1f8c2c50c3810598d61659dd7b1a238ef4def369