Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-26 6c189dba224d1e1de138e763d8146fea21bc6a2f

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

@@ -12,4 +12,5 @@
$wb['- None -'] = '- Geen enkele -';
$wb['proxy_server_txt'] = 'Proxy-Server';
$wb['firewall_server_txt'] = 'Firewall-Server';
$wb['xmpp_server_txt'] = 'XMPP Server';
?>