Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

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

@@ -9,4 +9,3 @@
$wb['source_error_unique'] = 'Quell Domain duplizieren.';
$wb['source_error_regex'] = 'Ungültiger Quell Domainname.';
?>