Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 26 Nov 2013 14:46:36 +0000 (15:46 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 26 Nov 2013 14:46:36 +0000 (15:46 +0100)

Trivial merge