From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 17 Dec 2014 16:21:08 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~13^2^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=472a1ed07124ac7df43c71024c17ec72362486d8;p=unfold.git

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

472a1ed07124ac7df43c71024c17ec72362486d8