From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 6 Mar 2012 21:47:28 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~22
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=1b114ae60d1d0caba61145877c06aed1a29773ca

Merge branch 'upstreammaster'
---

1b114ae60d1d0caba61145877c06aed1a29773ca