Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 21 Sep 2012 16:48:32 +0000 (18:48 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 21 Sep 2012 16:48:32 +0000 (18:48 +0200)
commit30b26f8f644e2c99673d15c96f2722b746f6fbe2
tree1fb5978a416dc75e1e86ca0cb5969a4a62f2d4b1
parentcf802a4f0250de22a6f38f1ee97a89e86bfc1128
parente2ff96618bc220125d3c465e6d7876140523e968
Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2