Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-07-08 341ef7175af7c8f21d27262b58da8f5bc2c06ef0

 interface/web/sites/lib/module.conf.php

@@ -5,7 +5,7 @@
$module["name"]  = "sites";
$module["title"]  = "top_menu_sites";
$module["template"]  = "module.tpl.htm";
$module["startpage"]  = "sites/web_domain_list.php";
$module["startpage"]  = "sites/web_vhost_domain_list.php";
$module["tab_width"]    = '';

// Websites menu