From: Jordan Augé <jordan.auge@lip6.fr>
Date: Tue, 8 Jul 2014 09:25:38 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~37
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a0828c4ed067e530b4f4f6ecdfbf88c0936bb4be;p=unfold.git

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

a0828c4ed067e530b4f4f6ecdfbf88c0936bb4be