Merge branch 'master' into 'master'

Marius Cramer

2014-05-19 9b4702d833708415d0cf05a98a00aac1bc850ff7

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

@@ -42,4 +42,5 @@
$wb['select_dbuser_txt'] = 'Select database user';
$wb['no_dbuser_txt'] = 'None';
$wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.';
$wb['database_user_missing_txt'] = 'Please select a database user for this database.';
?>