# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1331318349 0
# Node ID 87a5b7f39100a0b8006d4d68492830c22e253efb
# Parent  470f502f02a3db0d11e22644f2fbce94e4cac669# Parent  bd6dc94d60e933125262a04456c8bcdd2dad96da
Merge with Zash

diff -r 470f502f02a3 -r 87a5b7f39100 plugins/mod_admin_adhoc.lua
--- a/plugins/mod_admin_adhoc.lua	Thu Mar 08 00:18:16 2012 +0000
+++ b/plugins/mod_admin_adhoc.lua	Fri Mar 09 18:39:09 2012 +0000
@@ -10,7 +10,8 @@
 local hosts = prosody.hosts;
 local t_concat = table.concat;
 
-require "util.iterators";
+local iterators = require "util.iterators";
+local keys, values = iterators.keys, iterators.values;
 local usermanager_user_exists = require "core.usermanager".user_exists;
 local usermanager_create_user = require "core.usermanager".create_user;
 local usermanager_get_password = require "core.usermanager".get_password;
@@ -23,6 +24,7 @@
 local array = require "util.array";
 local modulemanager = require "modulemanager";
 
+module:depends"adhoc";
 local adhoc_new = module:require "adhoc".new;
 
 function add_user_command_handler(self, data, state)