From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 11 Jul 2012 12:50:24 +0000 (+0200)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~16
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=d3c6968ede6e7e26e14fd54ef451cd5015a4eef2

Merge branch 'upstreammaster'
---

d3c6968ede6e7e26e14fd54ef451cd5015a4eef2