From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 18 Dec 2014 14:30:58 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~8^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=03a115f8e1a770169f6cab6426b873bbebf894db

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

03a115f8e1a770169f6cab6426b873bbebf894db