aboutsummaryrefslogtreecommitdiffstats
path: root/core/moduleapi.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-09-29 17:07:50 +0100
committerMatthew Wild <mwild1@gmail.com>2012-09-29 17:07:50 +0100
commitabe6ad2794e97eb766dd6a772ae7d9c1556e2283 (patch)
treee37df475ed84a1b8d0b6c5ca95fc9812235ae905 /core/moduleapi.lua
parent4b710eec5ec25909bb7bea7afdce61f454e85259 (diff)
parent8279c2cf005b4ada8baf324d36a8ff90f80ca4e0 (diff)
downloadprosody-abe6ad2794e97eb766dd6a772ae7d9c1556e2283.tar.gz
prosody-abe6ad2794e97eb766dd6a772ae7d9c1556e2283.zip
Merge 0.9->trunk
Diffstat (limited to 'core/moduleapi.lua')
-rw-r--r--core/moduleapi.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index a6bfbd0f..20898fcf 100644
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -7,7 +7,7 @@
--
local config = require "core.configmanager";
-local modulemanager = require "core.modulemanager";
+local modulemanager = require "modulemanager"; -- This is necessary to avoid require loops
local array = require "util.array";
local set = require "util.set";
local logger = require "util.logger";