From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 24 Nov 2011 15:01:05 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-1~6^2~28
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9c10b94b39325e07a6a733b17125c5940380ece3;p=sfa.git

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

9c10b94b39325e07a6a733b17125c5940380ece3