Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-07-11 8e7f89749f427c3ba3fe0929fe3d536acc485302

1
2
3
4
5
6
7
<?php
$wb["list_head_txt"] = 'OpenVZ IP addresses';
$wb["server_id_txt"] = 'Server';
$wb['vm_id_txt'] = 'VM';
$wb["ip_address_txt"] = 'IP address';
$wb["reserved_txt"] = 'Reserved';
?>