From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 15 Dec 2011 13:18:39 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~26
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=7d41479ffc629cabcab476a94e4e93be41b29ecf

Merge branch 'upstreammaster'
---

7d41479ffc629cabcab476a94e4e93be41b29ecf