aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-05 13:06:48 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-05 13:06:48 +0100
commit591707b9103b710636b476ebe5471d61f93850a7 (patch)
treef844680a5fbcb9b0799257c96f87b6d9d2ed17bb
parentfc2ce67b3159f5d5b35b8109f5c2c11fc8b37c99 (diff)
parent4624a05183e166674f7520c264129b698126e59f (diff)
downloadprosody-591707b9103b710636b476ebe5471d61f93850a7.tar.gz
prosody-591707b9103b710636b476ebe5471d61f93850a7.zip
Merge 0.9->trunk
-rw-r--r--core/portmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua
index 1b3740cf..1b767a09 100644
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -9,7 +9,7 @@ local set = require "util.set";
local table = table;
local setmetatable, rawset, rawget = setmetatable, rawset, rawget;
-local type, tonumber, tostring, ipairs = type, tonumber, tostring, ipairs;
+local type, tonumber, tostring, ipairs, pairs = type, tonumber, tostring, ipairs, pairs;
local prosody = prosody;
local fire_event = prosody.events.fire_event;