From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 15 Jan 2015 10:09:28 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~122
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=5369b2e117fef0073efb9b2690dcf86312518e52

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

5369b2e117fef0073efb9b2690dcf86312518e52