From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 2 Jan 2013 12:36:52 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~5
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=667ee8a8989f8bba94827c4e9d3ea86b168a7e92

Merge branch 'upstreammaster'
---

667ee8a8989f8bba94827c4e9d3ea86b168a7e92