Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -11,4 +11,3 @@
$wb['proxy_server_txt'] = 'Proxyserver';
$wb['firewall_server_txt'] = 'Firewallserver';
?>