# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1275655987 -3600
# Node ID f7775971032469e75028a47d06b8f019836e9121
# Parent  a7f1329c5e3c0c80930e618e87f52294c1bedb2c
usermanager: Add hunk that got missed in a merge

diff -r a7f1329c5e3c -r f77759710324 core/usermanager.lua
--- a/core/usermanager.lua	Thu Jun 03 18:09:02 2010 +0500
+++ b/core/usermanager.lua	Fri Jun 04 13:53:07 2010 +0100
@@ -48,7 +48,8 @@
 			host_session.users = new_null_provider();
 		end
 	end);
-end
+   	host_session.users = new_null_provider(); -- Start with the default usermanager provider
+end;
 prosody.events.add_handler("host-activated", host_handler, 100);
 prosody.events.add_handler("component-activated", host_handler, 100);