Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -18,4 +18,3 @@
$wb['mailbox_size_limit_txt'] = 'E-Mail Kontogrössenlimit';
$wb['message_size_limit_txt'] = 'Nachrichtengrössenlimit';
?>