Merge branch 'master' of /home/git/repositories/Schoene/ispconfig3

Till Brehm

2014-01-06 0b50f8f4d7f2dc23a1886599b2f14d70eaa8d705

 interface/web/dashboard/lib/lang/en_dashlet_limits.lng

@@ -6,7 +6,7 @@
$wb['limit_mailmailinglist_txt'] = "Number of mailing lists";
$wb['limit_mailbox_txt'] = "Number of mailboxes";
$wb["limit_mailalias_txt"] = 'Number of email aliases';
$wb["limit_mailaliasdomain_txt"] = 'Number of domain aliases';
$wb["limit_mailaliasdomain_txt"] = 'Number of email domain aliases';
$wb["limit_mailforward_txt"] = 'Number of email forwarders';
$wb["limit_mailcatchall_txt"] = 'Number of email catchall accounts';
$wb["limit_mailrouting_txt"] = 'Number of email routes';