Merge remote-tracking branch 'linkmauve/die-gc1.0-die'

tests/end_to_end/scenarios/muc_disco_info.py

@@ -14,7 +14,7 @@ scenario = (
                   "!/iq/disco_info:query/dataform:x/dataform:field[@var='muc#roominfo_occupants']"),
 
     # Join the channel, and re-do the same query
-    send_stanza("<presence from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}/{nick_one}' />"),
+    send_stanza("<presence from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}/{nick_one}' ><x xmlns='http://jabber.org/protocol/muc'/></presence>"),
     sequences.connection("irc.localhost", '{jid_one}/{resource_one}'),
     expect_stanza("/message/body[text()='Mode #foo [+nt] by {irc_host_one}']"),
     expect_stanza("/presence[@to='{jid_one}/{resource_one}'][@from='#foo%{irc_server_one}/{nick_one}']/muc_user:x/muc_user:item[@affiliation='admin'][@role='moderator']",