From: Yasin <root@lamia.ipv6.lip6.fr>
Date: Tue, 10 Jun 2014 16:07:43 +0000 (-0500)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~68^2~3
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=6e8f0dd20d7bc7fd5edec2746f4c150a2597924c

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

6e8f0dd20d7bc7fd5edec2746f4c150a2597924c