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

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

701f28f114ad3bcf4c145420f294da5597a88390