Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2015-01-06 9724f8f13bdc6bfb2f9649c54ad37fb45bea9870

 interface/web/dashboard/ajax_get_json.php

@@ -66,6 +66,9 @@
   // vhostsubdomains
   $result[] = _search('sites', 'web_vhost_subdomain', "AND type = 'vhostsubdomain'");

   // vhostaliasdomains
   $result[] = _search('sites', 'web_vhost_aliasdomain', "AND type = 'vhostalias'");

   // FTP users
   $result[] = _search('sites', 'ftp_user');