From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Thu, 14 Mar 2013 13:21:26 +0000 (+0100)
Subject: Merge branch 'master' of git.onelab.eu:/git/sfa
X-Git-Tag: sfa-3.0-0^2^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8753f49d0f07c3419b387d798625ad1830c0ba9a;p=sfa.git

Merge branch 'master' of git.onelab.eu:/git/sfa
---

8753f49d0f07c3419b387d798625ad1830c0ba9a