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

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

6a832d61d008d5dd1a41df9fe3f63867e31da79e