From 015dffdc589b396d72092583cc526674f0a9a8d5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 18 Nov 2013 07:36:00 -0500
Subject: [PATCH] Merge remote-tracking branch 'sebj/master' and tidied up merged code

---
 interface/web/sites/lib/lang/en_web_domain.lng |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng
index e4fb30e..a5c1e35 100644
--- a/interface/web/sites/lib/lang/en_web_domain.lng
+++ b/interface/web/sites/lib/lang/en_web_domain.lng
@@ -120,4 +120,5 @@
 $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
 $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
 $wb['configuration_error_txt'] = "CONFIGURATION ERROR";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
 ?>
\ No newline at end of file

--
Gitblit v1.9.1