# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1342708591 -3600
# Node ID bc26e6d519ae3196f81f000280e628d7ccb608ec
# Parent  24c2150cc8b0723b9057bc592961f76f1af2acf1# Parent  4f1b6a4784f92d351f77710f66c48fb56adeff83
Merge 0.9->trunk

diff -r 24c2150cc8b0 -r bc26e6d519ae core/moduleapi.lua
--- a/core/moduleapi.lua	Mon Jul 09 02:36:09 2012 +0100
+++ b/core/moduleapi.lua	Thu Jul 19 15:36:31 2012 +0100
@@ -14,8 +14,6 @@
 local pluginloader = require "util.pluginloader";
 local timer = require "util.timer";
 
-local multitable_new = require "util.multitable".new;
-
 local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
 local error, setmetatable, setfenv, type = error, setmetatable, setfenv, type;
 local ipairs, pairs, select, unpack = ipairs, pairs, select, unpack;
@@ -339,4 +337,4 @@
 	return io.open(path, mode);
 end
 
-return api;
+return api;
\ No newline at end of file
diff -r 24c2150cc8b0 -r bc26e6d519ae plugins/mod_admin_adhoc.lua
--- a/plugins/mod_admin_adhoc.lua	Mon Jul 09 02:36:09 2012 +0100
+++ b/plugins/mod_admin_adhoc.lua	Thu Jul 19 15:36:31 2012 +0100
@@ -469,7 +469,6 @@
 			'". Error was: "'..tostring(err or "<unspecified>")..'"' } };
 		end
 	else
-		local modules = array.collect(keys(hosts[data.to].modules)):sort();
 		return { status = "executing", form = layout }, "executing";
 	end
 end