Mercurial > prosody-hg

comparison core/rostermanager.lua @ 6623:0da3e10b3333

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 05 Apr 2015 15:22:33 +0200
parents fb60cee2144e
children 7f9b49f2758a
comparison
equal deleted inserted replaced
6621:352fa2cae1c9 6623:0da3e10b3333
11 11
12 local log = require "util.logger".init("rostermanager"); 12 local log = require "util.logger".init("rostermanager");
13 13
14 local pairs = pairs; 14 local pairs = pairs;
15 local tostring = tostring; 15 local tostring = tostring;
16 local type = type;
16 17
17 local hosts = hosts; 18 local hosts = hosts;
18 local bare_sessions = prosody.bare_sessions; 19 local bare_sessions = prosody.bare_sessions;
19 20
20 local datamanager = require "util.datamanager" 21 local datamanager = require "util.datamanager"