# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1348934870 -3600
# Node ID 12f5a34380908d7b16998d49dd4b0c2ff696ebda
# Parent  cda4d3f01ddd788e9ea318e71a775c689c932b56# Parent  854f6d9aee2dfb536f2fe670104f21edaab74cd6
Merge 0.9->trunk

diff -r cda4d3f01ddd -r 12f5a3438090 core/moduleapi.lua
--- 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";