Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 05 Apr 2013 13:06:48 +0100
changeset 5433 7d0622a80087
parent 5431 19d537b5aacc (current diff)
parent 5432 53b16286509a (diff)
child 5437 1994a4483b1c
Merge 0.9->trunk
--- a/core/portmanager.lua	Fri Apr 05 10:05:18 2013 +0100
+++ b/core/portmanager.lua	Fri Apr 05 13:06:48 2013 +0100
@@ -9,7 +9,7 @@
 
 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;