From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 25 Mar 2014 17:01:50 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~177
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=957065ca108ec856b8d6406ab7bcc18e2ea677bf;p=myslice.git

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

957065ca108ec856b8d6406ab7bcc18e2ea677bf