From: Loic Baron <loic.baron@lip6.fr>
Date: Sat, 1 Mar 2014 13:50:14 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~256
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=88c06912c40136d405916eee802da3b984f881e5;p=myslice.git

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

88c06912c40136d405916eee802da3b984f881e5