# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1463920760 -7200
# Node ID 3b16f2802ef0688643d050507dad1b513176423d
# Parent  713d6f8e84d0b83a02d3943d3e112d801f8be69a# Parent  7eec6f3c73005e7d2f5d21930f044a6ded68e848
Merge 0.10->trunk

diff -r 713d6f8e84d0 -r 3b16f2802ef0 plugins/mod_presence.lua
--- a/plugins/mod_presence.lua	Sun May 22 02:16:57 2016 +0100
+++ b/plugins/mod_presence.lua	Sun May 22 14:39:20 2016 +0200
@@ -178,6 +178,7 @@
 		end
 		core_post_stanza(origin, stanza);
 		send_presence_of_available_resources(node, host, to_bare, origin);
+		core_post_stanza(origin, st.presence({ type = "probe", from = from_bare, to = to_bare }));
 	elseif stanza.attr.type == "unsubscribed" then
 		-- 1. send unavailable
 		-- 2. route stanza
diff -r 713d6f8e84d0 -r 3b16f2802ef0 util/datamanager.lua
--- a/util/datamanager.lua	Sun May 22 02:16:57 2016 +0100
+++ b/util/datamanager.lua	Sun May 22 14:39:20 2016 +0200
@@ -17,7 +17,9 @@
 local os_remove = os.remove;
 local os_rename = os.rename;
 local tonumber = tonumber;
+local tostring = tostring;
 local next = next;
+local type = type;
 local t_insert = table.insert;
 local t_concat = table.concat;
 local envloadfile = require"util.envload".envloadfile;
diff -r 713d6f8e84d0 -r 3b16f2802ef0 util/sql.lua
--- a/util/sql.lua	Sun May 22 02:16:57 2016 +0100
+++ b/util/sql.lua	Sun May 22 14:39:20 2016 +0200
@@ -2,6 +2,7 @@
 local setmetatable, getmetatable = setmetatable, getmetatable;
 local ipairs, unpack, select = ipairs, table.unpack or unpack, select; --luacheck: ignore 113
 local tonumber, tostring = tonumber, tostring;
+local type = type;
 local assert, pcall, xpcall, debug_traceback = assert, pcall, xpcall, debug.traceback;
 local t_concat = table.concat;
 local s_char = string.char;