From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 8 Nov 2011 00:12:20 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~36
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=68f0f5bf538b2633fceee633be2748aaa3eaa709;hp=-c

Merge branch 'upstreammaster'
---

68f0f5bf538b2633fceee633be2748aaa3eaa709