From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 5 Dec 2014 18:20:49 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~19^2~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=459533cb225580b6e9e58136fa81f5470537e7d0

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

459533cb225580b6e9e58136fa81f5470537e7d0