Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-21 856a3fda5a9c7a59bc89e3ac4800465e7b72c591

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

@@ -20,4 +20,5 @@
$wb['globalsearch_noresults_limit_txt'] = "0 results";
$wb['globalsearch_searchfield_watermark_txt'] = "Search";
$wb['globalsearch_suggestions_text_txt'] = "Suggestions";
$wb['limit_database_user_txt'] = "The max. number of database users is reached.";
?>