Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 30 Nov 2012 08:24:53 +0000 (09:24 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 30 Nov 2012 08:24:53 +0000 (09:24 +0100)
commit7f74bd28d305656417a6a19caa0cbceba81d1b66
tree245714762feb61bae90a9a5b779ad0ac6655ec37
parent3a2f30201ff035716eb0955d061e3a33f865b608
parent172dad4868e14dda24fd60c4445fbb917dda03ed
Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2