Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-24 f91c070119e135abbab4f3baf62b32059443ba19

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

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