From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 6 May 2013 08:18:17 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-26~15
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=961f3ee919553fa7aacd7a37188c2bf9b6dc85a7;p=sfa.git

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

961f3ee919553fa7aacd7a37188c2bf9b6dc85a7