Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

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

@@ -6,4 +6,3 @@
$wb['udp_port_txt'] = 'Открытые UDP порты';
$wb['add_new_record_txt'] = 'Добавить запись Firewall';
?>