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

Merge branch 'upstreammaster'
---

7fcb8153bd74ce00f9f0d43c8aa090e0b70e345f