From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 23 May 2012 08:22:54 +0000 (+0200)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~19
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=2ac2da4b770f57bede8e9a9ee65142242fdf05a3

Merge branch 'upstreammaster'
---

2ac2da4b770f57bede8e9a9ee65142242fdf05a3