Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 29 Sep 2012 17:07:50 +0100
changeset 5164 12f5a3438090
parent 5162 cda4d3f01ddd (current diff)
parent 5163 854f6d9aee2d (diff)
child 5166 72cdc2d4e15e
Merge 0.9->trunk
--- a/core/moduleapi.lua	Sat Sep 29 10:47:37 2012 +0100
+++ b/core/moduleapi.lua	Sat Sep 29 17:07:50 2012 +0100
@@ -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";