Merge branch 'mergebranch' into 'master'

Marius Burkard

2016-01-04 a4e127a6af97041b2c067f888f8c73a8aec682f1

 interface/web/sites/lib/lang/ru_database_list.lng

@@ -6,5 +6,5 @@
$wb['database_name_txt'] = 'Имя БД';
$wb['add_new_record_txt'] = 'Добавить новую БД';
$wb['database_user_txt'] = 'Database user';
$wb['parent_domain_id_txt'] = 'Website';
?>