From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 12 Mar 2014 15:52:01 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~200^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7ae0c099d60e417a77fd8f5fcb8278f087a14d84;p=myslice.git

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

7ae0c099d60e417a77fd8f5fcb8278f087a14d84