From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 20 Mar 2014 17:33:28 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~183
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0bbc8c2d0a8071630df62bf6b953377e9318e09e;p=myslice.git

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

0bbc8c2d0a8071630df62bf6b953377e9318e09e