Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorroot <root@Portable>
Mon, 14 Apr 2014 09:50:12 +0000 (11:50 +0200)
committerroot <root@Portable>
Mon, 14 Apr 2014 09:50:12 +0000 (11:50 +0200)
commit7e3085c0c1769a4d26c7ffdd27d8f50f402fa598
tree2e8ff9f07f54e82bb1611e17de4d5a80a2cbafc7
parentfc1057dc7f9526c7f13e002408bf181d978d0184
parentbf8ddd53efffa8c459343678686c0e7e4575a651
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab