# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1459609992 -7200
# Node ID d62f0471470fe9e2ea49dd414a2964d67499f8b3
# Parent  7e6409462f79899a674508403758b046d124ca56# Parent  d11701e86702e9e6d3f36265c7ce559284eab7b2
Merge 0.10->trunk

diff -r 7e6409462f79 -r d62f0471470f core/storagemanager.lua
--- a/core/storagemanager.lua	Tue Mar 29 15:38:14 2016 +0200
+++ b/core/storagemanager.lua	Sat Apr 02 17:13:12 2016 +0200
@@ -196,7 +196,7 @@
 function datamanager.users(host, datastore, typ)
 	local driver = open(host, datastore, typ);
 	if not driver.users then
-		return function() log("warn", "storage driver %s does not support listing users", driver.name) end
+		return function() log("warn", "Storage driver %s does not support listing users", driver.name) end
 	end
 	return driver:users();
 end
diff -r 7e6409462f79 -r d62f0471470f plugins/mod_bosh.lua
--- a/plugins/mod_bosh.lua	Tue Mar 29 15:38:14 2016 +0200
+++ b/plugins/mod_bosh.lua	Sat Apr 02 17:13:12 2016 +0200
@@ -309,6 +309,7 @@
 			end
 			s = filter("stanzas/out", s);
 			--log("debug", "Sending BOSH data: %s", tostring(s));
+			if not s then return true end
 			t_insert(session.send_buffer, tostring(s));
 
 			local oldest_request = r[1];