Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

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

@@ -81,4 +81,7 @@
$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";
$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
?>