From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 8 Dec 2011 15:37:39 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-3~18
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=b68af79064f6d34bbaf21e18dc12eeac293f82f9

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

b68af79064f6d34bbaf21e18dc12eeac293f82f9