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

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

55cc385f1daa4de9eac8afd3ae74ba2195163dec