Merge branch 'master' into 'master'

Marius Cramer

2014-07-07 b4945ae0c3f4e108090d05b34b3e7df8a753a2ec

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

@@ -12,4 +12,3 @@
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
?>