From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 21 Feb 2014 13:32:20 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~326
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2e2f6e22bf35363b4bc6485ed67e0c114b446222;p=unfold.git

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

2e2f6e22bf35363b4bc6485ed67e0c114b446222