Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

@@ -6,4 +6,3 @@
$wb['this_year_txt'] = 'Aktuelles Jahr';
$wb['last_year_txt'] = 'Vergangenes Jahr';
?>