From: ciro <ciro.scognamiglio@lip6.fr>
Date: Tue, 21 Apr 2015 15:36:54 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~35^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=9411399e9215852c3bcfdf708f9a9d984596f496

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

9411399e9215852c3bcfdf708f9a9d984596f496