From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 10 Nov 2011 14:40:22 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~35
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=7691d2227f76cac186cb98167ac425bd9b5c0d5e

Merge branch 'upstreammaster'
---

7691d2227f76cac186cb98167ac425bd9b5c0d5e