Merge branch 'geni-v3' of http://git.onelab.eu/sfa into geni-v3
authorLoic Baron <sandrine.avakian@inria.fr>
Fri, 30 May 2014 15:00:15 +0000 (17:00 +0200)
committerLoic Baron <sandrine.avakian@inria.fr>
Fri, 30 May 2014 15:00:15 +0000 (17:00 +0200)
commit97075bf8681b0631bcbee10547cb4c1cb606c907
tree6897f82f33439e08db233845c7c0cfe78ceb6e58
parentfb6607ca689efb9da8f28bb96601231449bd40e7
parenta8613b426cd2f8c918382dd55b312b0b1471054e
Merge branch 'geni-v3' of git.onelab.eu/sfa into geni-v3