From: Jordan Augé <jordan.auge@lip6.fr>
Date: Wed, 6 Aug 2014 09:37:26 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~29
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=c5ce008763e2e921336b22c390b0077b339a1bfe

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

c5ce008763e2e921336b22c390b0077b339a1bfe