# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1304547230 -3600
# Node ID b980a4173c1a6587552b36fbf77acf74699a5b86
# Parent  36ac38fd9cbd03d624f1fc8e6786f7236b7d5e10# Parent  403aba5e49d516a8887d885cd9bbf1da8428aa64
Merge 0.8->trunk

diff -r 36ac38fd9cbd -r b980a4173c1a plugins/muc/mod_muc.lua
--- a/plugins/muc/mod_muc.lua	Wed Apr 20 18:20:29 2011 +0100
+++ b/plugins/muc/mod_muc.lua	Wed May 04 23:13:50 2011 +0100
@@ -58,6 +58,9 @@
 		room._data.history = history;
 	elseif forced then
 		datamanager.store(node, muc_host, "config", nil);
+		if not next(room._occupants) then -- Room empty
+			rooms[room.jid] = nil;
+		end
 	end
 	if forced then datamanager.store(nil, muc_host, "persistent", persistent_rooms); end
 end