From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 14 Apr 2014 09:36:49 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~145
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=021d2c7b46d4d6a216913539ce64f3acf3a36bc1;p=myslice.git

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

021d2c7b46d4d6a216913539ce64f3acf3a36bc1