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

Merge branch 'upstreammaster'
---

d58796f6bdf59cc669ac207daebe03a0ef9dab3b