From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 18 Dec 2014 14:03:29 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~11^2~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=4971dd3e38a5267575b7a243d75950cb6087befd

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

4971dd3e38a5267575b7a243d75950cb6087befd