From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 18 Oct 2012 11:53:16 +0000 (+0200)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~8
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=6b2452ee7afc1b8b5723497aa04d3b985cbb726f

Merge branch 'upstreammaster'
---

6b2452ee7afc1b8b5723497aa04d3b985cbb726f