From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 27 Mar 2014 10:34:11 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~172^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=11b83a3dc742c2f139c67ced00dcca10713a9602

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

11b83a3dc742c2f139c67ced00dcca10713a9602