# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1253787467 -3600
# Node ID 5a86a9826b96d219f178d26829d861c8eff87bf5
# Parent  1c0bde3db7d8791db8e87cc1d35643bd5d46062f# Parent  e164fdb2d18f9fadb5d1fc964b58c24eb4ea690a
Merge with trunk

diff -r 1c0bde3db7d8 -r 5a86a9826b96 plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Thu Sep 24 11:16:25 2009 +0100
+++ b/plugins/muc/muc.lib.lua	Thu Sep 24 11:17:47 2009 +0100
@@ -187,7 +187,9 @@
 end
 
 local function room_get_disco_info(self, stanza)
-	return st.reply(stanza):query("http://jabber.org/protocol/disco#info"):tag("identity", {category="conference", type="text"});
+	return st.reply(stanza):query("http://jabber.org/protocol/disco#info")
+		:tag("identity", {category="conference", type="text"}):up()
+		:tag("feature", {var="http://jabber.org/protocol/muc"});
 end
 local function room_get_disco_items(self, stanza)
 	return st.reply(stanza):query("http://jabber.org/protocol/disco#items");