Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 17 Dec 2012 10:17:48 +0000 (11:17 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 17 Dec 2012 10:17:48 +0000 (11:17 +0100)

Trivial merge