# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1348912057 -3600
# Node ID cda4d3f01ddd788e9ea318e71a775c689c932b56
# Parent  3275a9705ef38f2a51288a77a2beef21bca2d063# Parent  da7fe5de82fb9ece6ec811d83f91c7280396871f
Merge 0.9->trunk

diff -r da7fe5de82fb -r cda4d3f01ddd core/moduleapi.lua
--- a/core/moduleapi.lua	Sat Sep 29 01:05:17 2012 +0200
+++ b/core/moduleapi.lua	Sat Sep 29 10:47:37 2012 +0100
@@ -7,7 +7,7 @@
 --
 
 local config = require "core.configmanager";
-local modulemanager = require "modulemanager";
+local modulemanager = require "core.modulemanager";
 local array = require "util.array";
 local set = require "util.set";
 local logger = require "util.logger";