Merge branch 'florian030/ispconfig3-master' into stable-3.1

Marius Burkard

2016-06-14 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c

 interface/web/sites/database_quota_stats.php

@@ -82,7 +82,6 @@
         $rec['used'] = 'n/a';
         if (empty($rec['database_quota'])) $rec['database_quota'] = 0;
         $rec['quota'] = $rec['database_quota'];
         $rec['quota'] = 'n/a';
      }
      $rec['id'] = $rec[$this->idx_key];