Merge branch 'sfa-geni-v3' of ssh://git.onelab.eu/git/tests into sfa-geni-v3
Thierry Parmentelat [Tue, 24 Feb 2015 16:50:24 +0000 (17:50 +0100)]

Trivial merge