From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 4 Jul 2012 10:05:28 +0000 (+0200)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~17
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=e8b16b96a23e1ab54e780587cc7cc0345a1ddf0e

Merge branch 'upstreammaster'
---

e8b16b96a23e1ab54e780587cc7cc0345a1ddf0e