From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 7 Aug 2013 15:03:38 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-27~35
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2940fc9f2e536f1d6c4d556001519c3e8a6a3332;p=sfa.git

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

2940fc9f2e536f1d6c4d556001519c3e8a6a3332