From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 14 Feb 2013 09:36:40 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-25~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=acf7c0ba147b24dd62948fe1f585e6ad7c91f59f;p=sfa.git

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

acf7c0ba147b24dd62948fe1f585e6ad7c91f59f