diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-01-21 01:29:00 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-01-21 01:29:00 +0000 |
| commit | 6f1ffa163d7e1624892aead18a400744750f29f8 (patch) | |
| tree | a2ed9fcc1c1496bdcbdf1da40e868aa4d50246fa /core/portmanager.lua | |
| parent | 6d2aec4a34dde4d20cc4a6f7e0a9a6db8057a630 (diff) | |
| parent | e0c0cffcc27601ec9e4dd3d6fcb556baa21f1e21 (diff) | |
| download | prosody-6f1ffa163d7e1624892aead18a400744750f29f8.tar.gz prosody-6f1ffa163d7e1624892aead18a400744750f29f8.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/portmanager.lua')
| -rw-r--r-- | core/portmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua index bc2d4264..eab2412a 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, pairs = type, tonumber, tostring, ipairs, pairs; +local type, tonumber, tostring, ipairs = type, tonumber, tostring, ipairs; local prosody = prosody; local fire_event = prosody.events.fire_event; |