Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -15,4 +15,3 @@
$wb['spam_redirect_maildir_purge_txt'] = 'Lösche E-Mail Verzeichnis nach';
$wb['days_txt'] = 'Tagen.';
?>