From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 8 Nov 2011 00:08:48 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-24~36^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=22629101f0eb055bbe3933937c5b342c3c8fc10b

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

22629101f0eb055bbe3933937c5b342c3c8fc10b