From: Jordan Augé <jordan.auge@lip6.fr>
Date: Wed, 23 Jul 2014 11:55:04 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~49^2~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=52100e3aa547c8911b59a3275aff73229d065f32;p=unfold.git

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

52100e3aa547c8911b59a3275aff73229d065f32