Merge branch 'sfa-geni-v2' of ssh://git.onelab.eu/git/tests into sfa-geni-v3
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 26 Aug 2015 12:10:23 +0000 (14:10 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 26 Aug 2015 12:10:23 +0000 (14:10 +0200)

Trivial merge