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

Trivial merge