Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-24 f91c070119e135abbab4f3baf62b32059443ba19

 interface/web/admin/lib/lang/de_server_list.lng

@@ -10,4 +10,5 @@
$wb['add_new_record_txt'] = 'Neuen Server hinzufügen';
$wb['proxy_server_txt'] = 'Proxyserver';
$wb['firewall_server_txt'] = 'Firewallserver';
$wb['xmpp_server_txt'] = 'XMPP';
?>