Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
fsaintma [Mon, 13 Apr 2015 14:05:01 +0000 (16:05 +0200)]

Trivial merge