From: Jordan Augé <jordan.auge@lip6.fr>
Date: Tue, 15 Jul 2014 13:51:05 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~57^2^2~6^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e0b1524e3e10ebaed162f72b3d6e2b9673516c53;p=unfold.git

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

e0b1524e3e10ebaed162f72b3d6e2b9673516c53