From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sun, 20 Nov 2011 09:07:49 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-0~15
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5c0e9940d36350e510f2acbe7ad9774fb2048ee4;p=sfa.git

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

5c0e9940d36350e510f2acbe7ad9774fb2048ee4