Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 11 Jan 2013 07:05:17 +0000 (08:05 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 11 Jan 2013 07:05:17 +0000 (08:05 +0100)

Trivial merge