diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-07-19 15:36:31 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-07-19 15:36:31 +0100 |
commit | 76bffb99b8cbfef4173443cc864469ba86452e03 (patch) | |
tree | 98bb2c521888e4c1af567103a1936cc33c5dc880 /core | |
parent | 9462cf30c6b16db4b6ac9814f8b06ede8611ccae (diff) | |
parent | 7adc50d2fdbe6086f43a6f125aafac86cb8d2ed0 (diff) | |
download | prosody-76bffb99b8cbfef4173443cc864469ba86452e03.tar.gz prosody-76bffb99b8cbfef4173443cc864469ba86452e03.zip |
Merge 0.9->trunk
Diffstat (limited to 'core')
-rw-r--r-- | core/moduleapi.lua | 4 |
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 |