From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 3 Dec 2014 18:05:51 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~13^2~2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=55dc9a94de09b1c957d938cfaea8c74e5342fed3

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

55dc9a94de09b1c957d938cfaea8c74e5342fed3