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

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

2f06be434c87ce050612b2fa77d9835f9436aa07