Merge branch 'sfa-geni-v3' of ssh://git.onelab.eu/git/tests into sfa-geni-v3
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 3 Jun 2014 14:52:12 +0000 (16:52 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 3 Jun 2014 14:52:12 +0000 (16:52 +0200)

Trivial merge