From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 1 Sep 2014 16:59:31 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~13^2~14
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=58c5ad9dac78de73fe8762541ebf36a7ce00b409

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

58c5ad9dac78de73fe8762541ebf36a7ce00b409