From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 17 Mar 2015 13:38:48 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-14~3
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=5404ec87098e28a160f3b53ccb751cd4086c7fa7

Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
---

5404ec87098e28a160f3b53ccb751cd4086c7fa7