From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 27 Feb 2014 18:05:31 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~268^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=6ba53085c00c1f416b28fd505e6611c154f0cc71

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

6ba53085c00c1f416b28fd505e6611c154f0cc71