From: fsaintma <frederic.saint-marcel@inria.fr>
Date: Mon, 13 Apr 2015 14:05:01 +0000 (+0200)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-15~16
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=acd13fb68264ecdc1996954f3f464537806f7380

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

acd13fb68264ecdc1996954f3f464537806f7380