From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Fri, 20 Sep 2013 12:19:53 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-27~23
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e5dbd1d16a81437a3dde0918b11a0520ae3ebb67;p=sfa.git

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

e5dbd1d16a81437a3dde0918b11a0520ae3ebb67