Merge branch 'mergebranch' into 'master'

Marius Burkard

2016-01-04 a4e127a6af97041b2c067f888f8c73a8aec682f1

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

@@ -9,3 +9,4 @@
$wb['ip_type_txt'] = 'Verze';
?>