Merge 0.9->0.10

diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 6f21ec3a14013afa92cecd899c60bc9ecc51f47d..b96288edab0f2fa4359ccd8eb3537ade22ca2372 100644 (file)
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -714,7 +714,7 @@ function room_mt:process_form(origin, stanza)
 
        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";