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

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

fe44e41f6699681b3426d10377568428c7264293