Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -8,4 +8,3 @@
$wb['groups_txt'] = 'Skupiny';
?>