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

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

31b87e762d7430afeb81cf45f0b8c086cda91095