From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 15 Apr 2015 15:29:53 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~37^2~14^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=96155eedb29b2afab0d340e8b449050cf9fbd627;p=myslice.git

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

96155eedb29b2afab0d340e8b449050cf9fbd627