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

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

4b11052d4dc092c03d6a80af4c01485acc2ecc6f