From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 29 Oct 2012 08:02:54 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~7
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=6717f88d0c48628d749af8c73939f1ddfcfba5b9

Merge branch 'upstreammaster'
---

6717f88d0c48628d749af8c73939f1ddfcfba5b9