From: fsaintma <frederic.saint-marcel@inria.fr>
Date: Tue, 17 Mar 2015 13:59:32 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-15~17
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=82d0355774b73966cbe0c838c611808dfd2f1c7a

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

82d0355774b73966cbe0c838c611808dfd2f1c7a