From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 30 Nov 2011 20:34:02 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~29
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=90ab94deecf2371c199d56cd35f0fd4fd20233e4

Merge branch 'upstreammaster'
---

90ab94deecf2371c199d56cd35f0fd4fd20233e4