From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 16 Dec 2011 14:09:29 +0000 (+0100)
Subject: Merge branch 'upstreammaster'
X-Git-Tag: sfa-2.1-24~25
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=e97e0020b0b054e3a340928538e4a2748ea65efc

Merge branch 'upstreammaster'
---

e97e0020b0b054e3a340928538e4a2748ea65efc