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)
commita94d461bcc1330c1de36889b879780805842f04b
treec4d77b96a344b67f5a0a5081eee8232004dcb3be
parent2b57d433f661012a319664600ca2e81404bc0812
parentbfd1bc1e283a98918b43c8207e1b6776dffee2d0
Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2