From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 25 Sep 2013 08:50:48 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-27~8^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=62e878645ee3a7e331a02fb0dde4465905835be1;p=sfa.git

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

62e878645ee3a7e331a02fb0dde4465905835be1