aboutsummaryrefslogtreecommitdiffstats
path: root/core/moduleapi.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-19 15:36:31 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-19 15:36:31 +0100
commit8ff644f2d3ae1e860396b211d9185a640f96cd73 (patch)
tree98bb2c521888e4c1af567103a1936cc33c5dc880 /core/moduleapi.lua
parent08553fc31ba154e7cabbd2c0540a12248a1924b4 (diff)
parentf4719b66bc5ed4391b93fb5931a256c1b21fbf1a (diff)
downloadprosody-8ff644f2d3ae1e860396b211d9185a640f96cd73.tar.gz
prosody-8ff644f2d3ae1e860396b211d9185a640f96cd73.zip
Merge 0.9->trunk
Diffstat (limited to 'core/moduleapi.lua')
-rw-r--r--core/moduleapi.lua4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index 24d29dfe..572dc179 100644
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -14,8 +14,6 @@ local logger = require "util.logger";
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 @@ function api:load_resource(path, mode)
return io.open(path, mode);
end
-return api;
+return api; \ No newline at end of file