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

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

6b18097c8867ce4c5b7388e527926fd3054c3e64