Merge branch 'sfa-geni-v3' of ssh://git.onelab.eu/git/tests into sfa-geni-v3
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 16 Jan 2014 19:45:13 +0000 (20:45 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 16 Jan 2014 19:45:13 +0000 (20:45 +0100)

Trivial merge