Merge remote-tracking branch 'florian030/master'

Marius Cramer

2014-04-10 58964a90d06f523f991a67bd1068e1f504d1f8a9

 interface/web/dashboard/dashlets/limits.php

@@ -71,7 +71,7 @@

      $limits[] = array('field' => 'limit_web_aliasdomain',
         'db_table' => 'web_domain',
                    'db_where' => "(type = 'alias' OR type = 'vhostalias'");
                    'db_where' => "(type = 'alias' OR type = 'vhostalias')");

      $limits[] = array('field' => 'limit_ftp_user',
         'db_table' => 'ftp_user',