From: Yasin <root@lamia.ipv6.lip6.fr>
Date: Thu, 5 Jun 2014 13:43:24 +0000 (-0500)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~68^2~7
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=3802d2308517f6ec27c8f0ea754409c0d4f4e2d7

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

3802d2308517f6ec27c8f0ea754409c0d4f4e2d7