aboutsummaryrefslogtreecommitdiffstats
path: root/core
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
commit4ea02cb9d6eab6bbda4a2f8e826e2cdaecce571e (patch)
treedca567b4af766d5a09a3746ab69da1e97405ff2e /core
parent69ae3450822605126f5541b6b0cf4587f19f465b (diff)
parent70645bf31bfa74609132ea72bbfe90c04cfa51e6 (diff)
downloadprosody-4ea02cb9d6eab6bbda4a2f8e826e2cdaecce571e.tar.gz
prosody-4ea02cb9d6eab6bbda4a2f8e826e2cdaecce571e.zip
Merge with 0.9
Diffstat (limited to 'core')
-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"