Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorSaint-Marcel Frederic <frederic.saint-marcel@inria.fr>
Fri, 23 May 2014 09:44:55 +0000 (11:44 +0200)
committerSaint-Marcel Frederic <frederic.saint-marcel@inria.fr>
Fri, 23 May 2014 09:44:55 +0000 (11:44 +0200)

Trivial merge