From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 21 Jan 2015 14:37:05 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~113^2~4
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=ac575fb40a8a128cdac22bdc0b868012011c5e66

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

ac575fb40a8a128cdac22bdc0b868012011c5e66