diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-12 00:32:10 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-12 00:32:10 +0100 |
| commit | f823a63ce870f3b464e06d15a41e5ecbbc88b583 (patch) | |
| tree | 8d6271d7aa6669750651b16347b61448eda8e0b6 /core | |
| parent | 890bf7ab7466264a1d334bc0aa8a84c22a4ebf56 (diff) | |
| parent | ef9b86202eb5ed42cefe788b01b1f09895d6899e (diff) | |
| download | prosody-f823a63ce870f3b464e06d15a41e5ecbbc88b583.tar.gz prosody-f823a63ce870f3b464e06d15a41e5ecbbc88b583.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/s2smanager.lua | 4 | ||||
| -rw-r--r-- | core/sessionmanager.lua | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index e4de498a..06d3f2c9 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -9,8 +9,8 @@ local hosts = prosody.hosts; -local tostring, pairs, getmetatable, newproxy, setmetatable - = tostring, pairs, getmetatable, newproxy, setmetatable; +local tostring, pairs, setmetatable + = tostring, pairs, setmetatable; local logger_init = require "util.logger".init; diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index d178fb2d..98ead07f 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -24,9 +24,6 @@ local uuid_generate = require "util.uuid".generate; local initialize_filters = require "util.filters".initialize; local gettime = require "socket".gettime; -local newproxy = newproxy; -local getmetatable = getmetatable; - module "sessionmanager" function new_session(conn) |