From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 25 Nov 2011 07:29:49 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~30
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=904c314440f4f0bd3f5c6c767fd7293f4887815b;p=sfa.git

Merge branch 'upstreammaster'
---

904c314440f4f0bd3f5c6c767fd7293f4887815b