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

Merge branch 'upstreammaster'
---

fe26b3a1489881ee252977df84561ea51da93ec2