Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorfsaintma <frederic.saint-marcel@inria.fr>
Fri, 18 Dec 2015 12:41:16 +0000 (13:41 +0100)
committerfsaintma <frederic.saint-marcel@inria.fr>
Fri, 18 Dec 2015 12:41:16 +0000 (13:41 +0100)

Trivial merge