From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 25 Oct 2011 14:41:40 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.1-1~43
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=8e13e7b178d5ffec16cdfa0e3b81f883fca5ec68

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

8e13e7b178d5ffec16cdfa0e3b81f883fca5ec68