From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 3 Jul 2013 15:28:19 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-27~57
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=864ad8da893e6ee54a74b82fec5afd6d480aa12a;p=sfa.git

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

864ad8da893e6ee54a74b82fec5afd6d480aa12a