Merge branch 'master' into 'master'

Marius Cramer

2015-06-27 3ba59d59a2ad4068d78753635531b7625c916258

 interface/web/admin/lib/lang/en_system_config.lng

@@ -80,4 +80,5 @@
$wb["default_slave_dnsserver_txt"] = 'Default Secondary DNS Server';
$wb["default_dbserver_txt"] = 'Default Database Server';
$wb["company_name_txt"] = "Company Name for the page title";
$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
?>