From: Jordan Augé <jordan.auge@lip6.fr>
Date: Thu, 10 Jul 2014 21:06:15 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~65
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5ba8b5d74143fe32c3059577017d235947c6b376;p=unfold.git

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

5ba8b5d74143fe32c3059577017d235947c6b376