Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 5 Nov 2013 11:49:41 +0000 (12:49 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 5 Nov 2013 11:49:41 +0000 (12:49 +0100)

Trivial merge