Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-17 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec

 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';
?>