Merge branch 'stable-3.1'

Marius Burkard

2016-01-20 337473b29af23892d2bcbe4cc97c087aa5ff8b30

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

@@ -10,4 +10,5 @@
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
$wb['no_folder_perm'] = 'You have no permission for this folder.';
$wb['error_user_exists_already_txt'] = 'There is already a record for this user.';
?>