diff options
author | Matthew Wild <mwild1@gmail.com> | 2008-10-24 07:36:48 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2008-10-24 07:36:48 +0100 |
commit | 2d7656d5db5476fd31a41e71e46205cab1bce74f (patch) | |
tree | f2cb19832a1a1c35d4a42286138b9f80968bc3da /core/sessionmanager.lua | |
parent | d49ea8a12e4440a0df267b575e4925231bda4803 (diff) | |
parent | 5c90ffdf7e7c7d784ed5f60eed3f8a2666c117f8 (diff) | |
download | prosody-2d7656d5db5476fd31a41e71e46205cab1bce74f.tar.gz prosody-2d7656d5db5476fd31a41e71e46205cab1bce74f.zip |
Merging more s2s
Diffstat (limited to 'core/sessionmanager.lua')
-rw-r--r-- | core/sessionmanager.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index fd9b1272..2b7659d2 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -11,7 +11,7 @@ local sessions = sessions; local modulemanager = require "core.modulemanager"; local log = require "util.logger".init("sessionmanager"); local error = error; -local uuid_generate = require "util.uuid".uuid_generate; +local uuid_generate = require "util.uuid".generate; local rm_load_roster = require "core.rostermanager".load_roster; local newproxy = newproxy; |