From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 9 Dec 2013 14:45:16 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~89^2~8^2~2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=064bbf6cc8b7fa30371e5a96db4167761a71146e

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

064bbf6cc8b7fa30371e5a96db4167761a71146e