From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 20 Dec 2013 11:20:35 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.3-0~42^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=1e6ad323ac42147a48450401f49f292e97f91ff4

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

1e6ad323ac42147a48450401f49f292e97f91ff4