aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-02-12 17:55:22 +0000
committerMatthew Wild <mwild1@gmail.com>2012-02-12 17:55:22 +0000
commitbc79812f6cd7a7bca0ccaaaa5118e9aa561f4422 (patch)
treedca567b4af766d5a09a3746ab69da1e97405ff2e
parentbe5998772498c982f5dd192787ca12c4aad6b0dd (diff)
parent56edb2db8c8c97cd981d7ad34a17c0d19ce46120 (diff)
downloadprosody-bc79812f6cd7a7bca0ccaaaa5118e9aa561f4422.tar.gz
prosody-bc79812f6cd7a7bca0ccaaaa5118e9aa561f4422.zip
Merge with 0.9
-rw-r--r--core/hostmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 7edf8230..330a0d03 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -24,7 +24,7 @@ if not _G.prosody.incoming_s2s then
end
local incoming_s2s = _G.prosody.incoming_s2s;
-local pairs, setmetatable = pairs, setmetatable;
+local pairs, setmetatable, select = pairs, setmetatable, select;
local tostring, type = tostring, type;
module "hostmanager"