aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-04-05 15:22:33 +0200
committerKim Alvefur <zash@zash.se>2015-04-05 15:22:33 +0200
commit289dae62f86a64943ace04beb972e13eaab8f50f (patch)
treed3159081b883ccf8010593d5f882982116322e22
parent9ba4eef47c2806af0323f8ee215acfa16e49df57 (diff)
parent17e942c4dc0d1afa484d07c1279ca7d5446ea6e9 (diff)
downloadprosody-289dae62f86a64943ace04beb972e13eaab8f50f.tar.gz
prosody-289dae62f86a64943ace04beb972e13eaab8f50f.zip
Merge 0.10->trunk
-rw-r--r--core/rostermanager.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 7e165c27..b39e5323 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -13,6 +13,7 @@ local log = require "util.logger".init("rostermanager");
local pairs = pairs;
local tostring = tostring;
+local type = type;
local hosts = hosts;
local bare_sessions = prosody.bare_sessions;