From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 12 Dec 2012 09:14:22 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~6
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=f56515411fd74aaa036cd1c7138da353e7fb7712

Merge branch 'upstreammaster'
---

f56515411fd74aaa036cd1c7138da353e7fb7712