From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 24 Jul 2014 16:11:24 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~45^2^2~2^2~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=e17c4ff5fd80bb24573047eb832ea6ca5c2fc73e

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

e17c4ff5fd80bb24573047eb832ea6ca5c2fc73e