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

Merge branch 'upstreammaster'
---

bc606b4e5ce0cf686274510d1167ec85340c4e83