From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 27 May 2013 13:28:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-26~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=dac5b9ace8298b660e389134d25f260ee61cd07b;p=sfa.git

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

dac5b9ace8298b660e389134d25f260ee61cd07b