# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1348344788 -18000
# Node ID a86efd60425f8d2d3fee48d632986c63dd8e0481
# Parent  9ca67015ba0e425c5c9a51b876303523d79dfee6# Parent  3221746f4769476414937c3551060c6426777444
Merge 0.9->trunk

diff -r 9ca67015ba0e -r a86efd60425f 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