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

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

a1f72f680d4745eb0352b499819ac4672deceb66