From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 5 Dec 2011 14:58:52 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-2~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bb45f26e96c369b554e747792d03d0b273a2d4f7;p=sfa.git

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

bb45f26e96c369b554e747792d03d0b273a2d4f7