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

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

2a9dee0af498110faec36675bbd08c84e02b479c