From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 3 Apr 2014 13:35:02 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~157
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c624b017611ae21cda21f28529cd8412dfc12669;p=myslice.git

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

c624b017611ae21cda21f28529cd8412dfc12669