From: Jordan Augé <jordan.auge@lip6.fr>
Date: Thu, 24 Jul 2014 15:48:42 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~45^2^2~4
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=871d4c61cac666e6a5e8111afb2235d2713ccfaf

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

871d4c61cac666e6a5e8111afb2235d2713ccfaf