Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-19 dc7aa0813f52eed4eb039a21ee13d6a5cb7f104c

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