Merge branch 'master' into 'master'

Marius Cramer

2015-06-07 fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44

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

@@ -13,4 +13,3 @@
$wb['proxy_server_txt'] = 'Proxy-server';
$wb['firewall_server_txt'] = 'Brandväggsserver';
?>