Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 13 Dec 2013 14:35:44 +0000 (15:35 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 13 Dec 2013 14:35:44 +0000 (15:35 +0100)
commita0ecdcce6c47700324b8cdb94951ab11392b4642
treed248428d0aed1e906aecc4f77b91da23f97461f2
parentfae309c53ba7e65f1b51047d8c8fbb7a10477713
parent91cd07bd7558edb9c81c1d36fddc13cf81aedf55
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3