Permalink
Browse files

Merge 0.9->trunk

  • Loading branch information...
2 parents 4924e9c + 82f5b95 commit 827c0b2d5265c1d3afd54010ef9d421eccc620ab @mwild1 mwild1 committed Sep 29, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 core/moduleapi.lua
View
@@ -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";

0 comments on commit 827c0b2

Please sign in to comment.