Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
fsaintma [Tue, 17 Mar 2015 13:59:32 +0000 (14:59 +0100)]

Trivial merge