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

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

8d664e07a6d7f3ab45e5bf6ab7ea62a4525684c9