# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1496318758 -7200
# Node ID a49c8930da3d233bb4e3841a136571be3de1debd
# Parent  b4cbd65ee4c5c124ccdce9ce7091840005aba7fe# Parent  31938a0c398f6d9971de273e595ad62928194e5a
Merge 0.10->trunk

diff -r b4cbd65ee4c5 -r a49c8930da3d core/certmanager.lua
--- a/core/certmanager.lua	Sun May 28 23:40:26 2017 +0200
+++ b/core/certmanager.lua	Thu Jun 01 14:05:58 2017 +0200
@@ -216,6 +216,7 @@
 
 local function reload_ssl_config()
 	global_ssl_config = configmanager.get("*", "ssl");
+	global_certificates = configmanager.get("*", "certificates") or "certs";
 	if luasec_has.no_compression then
 		core_defaults.options.no_compression = configmanager.get("*", "ssl_compression") ~= true;
 	end
diff -r b4cbd65ee4c5 -r a49c8930da3d plugins/mod_welcome.lua
--- a/plugins/mod_welcome.lua	Sun May 28 23:40:26 2017 +0200
+++ b/plugins/mod_welcome.lua	Thu Jun 01 14:05:58 2017 +0200
@@ -14,8 +14,8 @@
 module:hook("user-registered",
 	function (user)
 		local welcome_stanza =
-			st.message({ to = user.username.."@"..user.host, from = host })
-				:tag("body"):text(welcome_text:gsub("$(%w+)", user));
+			st.message({ to = user.username.."@"..user.host, from = host },
+				welcome_text:gsub("$(%w+)", user));
 		module:send(welcome_stanza);
 		module:log("debug", "Welcomed user %s@%s", user.username, user.host);
 	end);