Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Thu, 24 Jul 2014 15:48:42 +0000 (17:48 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Thu, 24 Jul 2014 15:48:42 +0000 (17:48 +0200)
commit871d4c61cac666e6a5e8111afb2235d2713ccfaf
tree7acee873c329ac0f758c5c04e01c0d6fbc083b21
parent2696c755ef27a62406f190412eb8736393682bac
parentf0189aa63439eab37be9b04cb728d17c3c867f71
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab