From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 11 Jul 2012 15:45:04 +0000 (+0200)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~15
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=999893377056972a8ac599135dee3f6cbe530f3f;hp=999893377056972a8ac599135dee3f6cbe530f3f;p=sfa.git

Merge branch 'upstreammaster'
---