Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
authorJordan Augé <sandrine.avakian@inria.fr>
Wed, 20 Aug 2014 13:25:07 +0000 (15:25 +0200)
committerJordan Augé <sandrine.avakian@inria.fr>
Wed, 20 Aug 2014 13:25:07 +0000 (15:25 +0200)
commit432cca980c7eed80284776f05566cf628088f7aa
tree6931140b833348b2a99cf8720f4ccb7bdf7b87c0
parente67886999832ba3b616c9168f93bcf7d233c5a23
parent3017dd2038fc11a41c8b886eb7c565c486c3e922
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3