From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 30 Aug 2012 10:13:20 +0000 (+0200)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~13
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=3d9943d1e5f993408b618cde29ff31b3585e5cef

Merge branch 'upstreammaster'
---

3d9943d1e5f993408b618cde29ff31b3585e5cef