From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sun, 6 Nov 2011 20:05:12 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~37
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=e98b602a586412b828057bcebf2b6073697720a5

Merge branch 'upstreammaster'
---

e98b602a586412b828057bcebf2b6073697720a5