From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 24 Oct 2013 15:37:00 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: 0.2-6~6^2^2~1^2~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=c7a400ed17b77bcaa148cc77ee75c6e0687e1842

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

c7a400ed17b77bcaa148cc77ee75c6e0687e1842