Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-26 6c189dba224d1e1de138e763d8146fea21bc6a2f

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

@@ -12,6 +12,5 @@
$wb['- None -'] = '- izaberi server -';
$wb['proxy_server_txt'] = 'Proxy server';
$wb['firewall_server_txt'] = 'Vatrozid server';
$wb['xmpp_server_txt'] = 'XMPP Server';
?>