# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1365163608 -3600
# Node ID 7d0622a80087efbc3323eba3501f2dec1b9ba6d7
# Parent  19d537b5aaccb9c1f317a60fe348e8ab3c40487d# Parent  53b16286509a24c61162a53af715e8ef1f17b142
Merge 0.9->trunk

diff -r 19d537b5aacc -r 7d0622a80087 core/portmanager.lua
--- 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;