From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 6 Sep 2013 15:24:25 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~4
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=58c7f8119c916a8f50e85c4f880a8e11d8289437

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

58c7f8119c916a8f50e85c4f880a8e11d8289437