Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-14 80c6a7f559ceb100b82921019bab3a0c5ed2ae2a

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

@@ -10,4 +10,5 @@
$wb['add_new_record_txt'] = 'Добавить новый сервер';
$wb['proxy_server_txt'] = 'Proxy';
$wb['firewall_server_txt'] = 'Firewall';
$wb['xmpp_server_txt'] = 'XMPP';
?>