From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 13 Jul 2012 07:27:37 +0000 (+0200)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d8d584c3122c72a43422493b7c573e2d4b9d3e5e;hp=-c;p=sfa.git

Merge branch 'upstreammaster'
---

d8d584c3122c72a43422493b7c573e2d4b9d3e5e