From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 18 Nov 2011 09:54:08 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~32
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=de46e2cf9793a28dcf5e5d9b128da3e9abc1755d

Merge branch 'upstreammaster'
---

de46e2cf9793a28dcf5e5d9b128da3e9abc1755d