From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 2 Sep 2013 16:04:38 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~31
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=fd97f2a187b8003f9bb532d7d84a332411e62f3e

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

fd97f2a187b8003f9bb532d7d84a332411e62f3e