From: Jordan Augé <jordan.auge@lip6.fr>
Date: Thu, 6 Mar 2014 14:58:26 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~219^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a5361a5bcf8457eea5f25fed266db99a5fa7ac88;p=unfold.git

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

a5361a5bcf8457eea5f25fed266db99a5fa7ac88