From: fsaintma <frederic.saint-marcel@inria.fr>
Date: Wed, 10 Jun 2015 07:23:47 +0000 (+0200)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-21~47
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=1b2d25aa9aa2eabde904b1473451305372c4ed92

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

1b2d25aa9aa2eabde904b1473451305372c4ed92