From: Jordan Augé <jordan.auge@lip6.fr>
Date: Thu, 19 Jun 2014 13:31:32 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~64
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6e24f5c8289f13a60d28a86543e8a84db63f4426;p=unfold.git

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

6e24f5c8289f13a60d28a86543e8a84db63f4426