From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 2 Dec 2014 14:46:46 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~13^2~4
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=6032c2b38c3885f3f0f1d139fb8ddba88a929c18

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

6032c2b38c3885f3f0f1d139fb8ddba88a929c18