# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1368520772 -3600
# Node ID b8101bc0630f49e3341865d91f4f11e91d148504
# Parent  345593806e223dcde49056423434cc0caa949fc2# Parent  8b09b0d068d42bff1d88e373b7afea26b4c9d3dd
Merge 0.9->trunk

diff -r 345593806e22 -r b8101bc0630f plugins/muc/mod_muc.lua
--- a/plugins/muc/mod_muc.lua	Sat May 11 13:55:36 2013 +0100
+++ b/plugins/muc/mod_muc.lua	Tue May 14 09:39:32 2013 +0100
@@ -83,6 +83,7 @@
 	room.route_stanza = room_route_stanza;
 	room.save = room_save;
 	rooms[jid] = room;
+	module:fire_event("muc-room-created", { room = room });
 	return room;
 end
 
diff -r 345593806e22 -r b8101bc0630f plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Sat May 11 13:55:36 2013 +0100
+++ b/plugins/muc/muc.lib.lua	Tue May 14 09:39:32 2013 +0100
@@ -767,6 +767,7 @@
 		self._occupants[nick] = nil;
 	end
 	self:set_persistent(false);
+	module:fire_event("muc-room-destroyed", { room = self });
 end
 
 function room_mt:handle_to_room(origin, stanza) -- presence changes and groupchat messages, along with disco/etc
diff -r 345593806e22 -r b8101bc0630f util-src/hashes.c
--- a/util-src/hashes.c	Sat May 11 13:55:36 2013 +0100
+++ b/util-src/hashes.c	Tue May 14 09:39:32 2013 +0100
@@ -15,7 +15,12 @@
 
 #include <string.h>
 #include <stdlib.h>
+
+#ifdef _MSC_VER
+typedef unsigned __int32 uint32_t;
+#else
 #include <inttypes.h>
+#endif
 
 #include "lua.h"
 #include "lauxlib.h"