# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1450284357 0
# Node ID 990b4ddaf582fa10f8c44f0b78670a4381e3da0e
# Parent  61f5f8435e0bee646af95fed7ad0114f0b01cab7# Parent  2d5751b2f21c4874858b509a6a50cdf02eb89b8e
Merge 0.9->0.10

diff -r 61f5f8435e0b -r 990b4ddaf582 plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Wed Dec 16 16:44:40 2015 +0000
+++ b/plugins/muc/muc.lib.lua	Wed Dec 16 16:45:57 2015 +0000
@@ -714,7 +714,7 @@
 
 	if next(changed) then
 		local msg = st.message({type='groupchat', from=self.jid})
-			:tag('x', {xmlns='http://jabber.org/protocol/muc#user'}):up()
+			:tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
 				:tag('status', {code = '104'}):up();
 		if changed.whois then
 			local code = (self:get_whois() == 'moderators') and "173" or "172";
diff -r 61f5f8435e0b -r 990b4ddaf582 util/uuid.lua