# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1458424001 -3600
# Node ID b6adb7c1a645b15ac073aecd93b956f5c7aca9da
# Parent  92d86016e1e3c1e4218fc7598cb3f30169ee625b# Parent  439d00063620669875c3777f08808fc968b1ee70
Merge 0.10->trunk

diff -r 92d86016e1e3 -r b6adb7c1a645 core/modulemanager.lua
--- a/core/modulemanager.lua	Fri Mar 18 14:03:35 2016 +0000
+++ b/core/modulemanager.lua	Sat Mar 19 22:46:41 2016 +0100
@@ -125,7 +125,9 @@
 	end
 
 	if modulemap[host][module_name] then
-		log("debug", "%s is already loaded for %s, so not loading again", module_name, host);
+		if not modulemap["*"][module_name] then
+			log("debug", "%s is already loaded for %s, so not loading again", module_name, host);
+		end
 		return nil, "module-already-loaded";
 	elseif modulemap["*"][module_name] then
 		local mod = modulemap["*"][module_name];