From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 5 Sep 2013 10:57:01 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~17
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=fd94e2aa074f084afdecf26f023c8e369fec6605

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

fd94e2aa074f084afdecf26f023c8e369fec6605