Merge branch '3817-AddClientIdResellerToken' into 'stable-3.1'

Till Brehm

2016-04-06 1e33ee2d84585ce7e4eefd442c7f5726128f8177

 interface/web/mailuser/lib/lang/de.lng

@@ -5,6 +5,5 @@
$wb['Autoresponder'] = 'Autoresponder';
$wb['Send copy'] = 'Kopie senden an';
$wb['Spamfilter'] = 'Spamfilter';
$wb['Email Filters'] = 'E-Mail Filter';
$wb['Email Filters'] = 'E-Mailfilter';
?>