From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 4 Sep 2012 08:34:44 +0000 (+0200)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~12
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=031e5c50de5860921dfada9a3d54a9242339836e

Merge branch 'upstreammaster'
---

031e5c50de5860921dfada9a3d54a9242339836e