# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1336060324 -3600
# Node ID 3bf0100d7303d0bdc41aa675f2ba9842a0293631
# Parent  07d0a3a75c8af7d63d0ad23d8a151494555a30d5# Parent  3068ec951ffdb937a36ece372942b6de589b856d
Merge with Zash

diff -r 07d0a3a75c8a -r 3bf0100d7303 core/portmanager.lua
--- a/core/portmanager.lua	Thu May 03 16:48:34 2012 +0100
+++ b/core/portmanager.lua	Thu May 03 16:52:04 2012 +0100
@@ -7,7 +7,7 @@
 
 local table, package = table, package;
 local setmetatable, rawset, rawget = setmetatable, rawset, rawget;
-local type, tonumber, ipairs = type, tonumber, ipairs;
+local type, tonumber, ipairs, pairs = type, tonumber, ipairs, pairs;
 
 local prosody = prosody;
 local fire_event = prosody.events.fire_event;