From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 29 Oct 2014 15:12:15 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~13^2~9^2~2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=5a690e87a71059403fe3872a5a11b437f22f0438

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

5a690e87a71059403fe3872a5a11b437f22f0438