Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-15 09b790e9c59c496ec1aa537ff7bfa21ca0f4b5cd

1
2
3
4
5
6
7
<?php
$wb["Virtual Servers"] = 'Virtual Servers';
$wb["OS Templates"] = 'OS Templates';
$wb["VM Templates"] = 'VM Templates';
$wb["IP addresses"] = 'IP addresses';
$wb["OpenVZ"] = 'OpenVZ';
?>