Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 13 Dec 2013 14:35:44 +0000 (15:35 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 13 Dec 2013 14:35:44 +0000 (15:35 +0100)

Trivial merge