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

Merge branch 'upstreammaster'
---

f48057a979a837246e225f451a9eb428ac3d6bd3