# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1428240153 -7200
# Node ID 0da3e10b3333e1cd9320084a1fdfa04dea138be2
# Parent  352fa2cae1c99fc2de126920b872e5a3082a5bea# Parent  fb60cee2144e3ecf7749c374c38debbcc95bc568
Merge 0.10->trunk

diff -r 352fa2cae1c9 -r 0da3e10b3333 core/rostermanager.lua
--- a/core/rostermanager.lua	Fri Apr 03 19:34:47 2015 +0100
+++ b/core/rostermanager.lua	Sun Apr 05 15:22:33 2015 +0200
@@ -13,6 +13,7 @@
 
 local pairs = pairs;
 local tostring = tostring;
+local type = type;
 
 local hosts = hosts;
 local bare_sessions = prosody.bare_sessions;