From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 21 Feb 2014 13:39:32 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~325
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fb88f8872d47629d6605e97300c0d4c474a82803;hp=-c;p=myslice.git

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

fb88f8872d47629d6605e97300c0d4c474a82803