# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1380989788 14400
# Node ID 275d4da9404f15023c34087bfcf10d8d34cfc494
# Parent  16a2bb97c5f560062c99a0d0b1eb2d7e91f98efe# Parent  84bdac93910f19367631cff33b4839505e585516
Merge 0.10->trunk

diff -r 84bdac93910f -r 275d4da9404f plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Fri Oct 04 18:42:44 2013 +0200
+++ b/plugins/muc/muc.lib.lua	Sat Oct 05 12:16:28 2013 -0400
@@ -202,7 +202,7 @@
 		:tag("feature", {var=self._data.whois ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):up()
 		:add_child(dataform.new({
 			{ name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" },
-			{ name = "muc#roominfo_description", label = "Description"},
+			{ name = "muc#roominfo_description", label = "Description", value = "" },
 			{ name = "muc#roominfo_occupants", label = "Number of occupants", value = tostring(count) }
 		}):form({["muc#roominfo_description"] = self:get_description()}, 'result'))
 	;