Merge branch '3817-AddClientIdResellerToken' into 'stable-3.1'

Till Brehm

2016-04-06 1e33ee2d84585ce7e4eefd442c7f5726128f8177

1
2
3
4
<?php
$wb["list_head_txt"] = 'Server Configuration';
$wb["server_name_txt"] = 'Server';
?>