# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1231341264 0
# Node ID cc82394fea2220b63472a96221f1f434e2aa8bfe
# Parent  4f506c627b49abba2c928786a63761426c3e2001# Parent  7db1044d2fab2fdb0ac98ed98f38d064915ea940
Automated merge with http://waqas.ath.cx:8000/

diff -r 4f506c627b49 -r cc82394fea22 core/modulemanager.lua
--- a/core/modulemanager.lua	Wed Jan 07 20:03:59 2009 +0500
+++ b/core/modulemanager.lua	Wed Jan 07 15:14:24 2009 +0000
@@ -80,7 +80,9 @@
 	local modules_enabled = config.get(host, "core", "modules_enabled");
 	if modules_enabled then
 		for _, module in pairs(modules_enabled) do
-			load(host, module);
+			if not is_loaded(host, module) then
+				load(host, module);
+			end
 		end
 	end
 end