From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 24 Jan 2013 16:46:29 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~4
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a49c0e1ae9001aa0ff22cc7262e5669db0739df5

Merge branch 'upstreammaster'
---

a49c0e1ae9001aa0ff22cc7262e5669db0739df5