Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 11 Feb 2016 14:29:13 +0000 (15:29 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 11 Feb 2016 14:29:13 +0000 (15:29 +0100)
commita536abae9b62e70e37960cb230c65dfb60aaa90e
treec77f06ea5406ccc7f2952fa1a1485262e7dfe4cf
parentb7fc87dd0267474f721d5c2265e7bf1df6ff7078
parent33710d17d14e2056a27ad77fca004929bf116bd5
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab