From: fsaintma <frederic.saint-marcel@inria.fr>
Date: Fri, 18 Dec 2015 12:41:16 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-21~43
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=b835890db506439d1925577ccdc9ef4f0b3dc6ac

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

b835890db506439d1925577ccdc9ef4f0b3dc6ac