Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -4,4 +4,3 @@
$wb['database_user_txt'] = 'Datenbank Benutzer';
$wb['sys_groupid_txt'] = 'Kunde';
?>