From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 23 Nov 2011 17:54:00 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-0~5
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a665d295716a0f85228d4990ac05397d1b4ffffe

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

a665d295716a0f85228d4990ac05397d1b4ffffe