Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
fsaintma [Mon, 8 Jun 2015 08:41:14 +0000 (10:41 +0200)]

Trivial merge