Merge 0.9->trunk
authorWaqas Hussain <waqas20@gmail.com>
Sun, 23 Sep 2012 01:13:08 +0500
changeset 5143 a86efd60425f
parent 5141 9ca67015ba0e (current diff)
parent 5142 3221746f4769 (diff)
child 5160 da7fe5de82fb
Merge 0.9->trunk
prosodyctl
--- a/prosodyctl	Wed Sep 19 23:29:25 2012 +0200
+++ b/prosodyctl	Sun Sep 23 01:13:08 2012 +0500
@@ -227,6 +227,7 @@
 	return {
 		type = "local",
 		events = prosody.events,
+		modules = {},
 		users = require "core.usermanager".new_null_provider(hostname)
 	};
 end