From: Jordan Augé <jordan.auge@lip6.fr>
Date: Fri, 28 Mar 2014 14:55:53 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~164^2~4^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8cbb4a7c75dc0f0c5972b4f915531d3ac9d024d2;p=unfold.git

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

8cbb4a7c75dc0f0c5972b4f915531d3ac9d024d2