From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 28 Mar 2014 14:57:10 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~164^2~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3eb7bbb9e74f9126d0f6106290d50700e3cd6164;p=myslice.git

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

3eb7bbb9e74f9126d0f6106290d50700e3cd6164