From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 24 Feb 2014 11:32:30 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~316^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ac03a689e86f983faa4cf3d77c72b928d6f787dc;p=myslice.git

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

ac03a689e86f983faa4cf3d77c72b928d6f787dc