From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 28 Feb 2014 15:21:47 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~264^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b65ea02a68a46b521e90449d9e93924ca9eaff39;p=myslice.git

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

b65ea02a68a46b521e90449d9e93924ca9eaff39