From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 1 Dec 2011 09:34:42 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~28
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=72c373c3b1ecd0d14fb945913856443baaca3f8f;p=sfa.git

Merge branch 'upstreammaster'
---

72c373c3b1ecd0d14fb945913856443baaca3f8f