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

Merge branch 'upstreammaster'
---

84d7c64d69aca48fe56233346a38ad0d6ef778a8