Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/mail/lib/lang/de_mail_domain_list.lng

@@ -5,4 +5,3 @@
$wb['add_new_record_txt'] = 'Neue Domain hinzufügen';
$wb['active_txt'] = 'Aktiv';
?>