From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 10 Mar 2014 17:31:11 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~208^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=d74c083ca8390ce0812d730bc57ab95728013baf

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

d74c083ca8390ce0812d730bc57ab95728013baf