# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1289621569 0
# Node ID e2cfc6b8fe5d7229ecfda468cb48a064c9da2a25
# Parent  418354197a02d564316857dab4dc0fb926c12d6c# Parent  6f4db418a9cc1531c7ac97071e41e94cb5f0d3d9
Merge backout

diff -r 418354197a02 -r e2cfc6b8fe5d core/modulemanager.lua
--- a/core/modulemanager.lua	Sat Nov 13 04:12:03 2010 +0000
+++ b/core/modulemanager.lua	Sat Nov 13 04:12:49 2010 +0000
@@ -117,7 +117,6 @@
 
 	local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
 	api_instance.environment = pluginenv;
-	pluginenv._M = pluginenv;
 	
 	setfenv(mod, pluginenv);
 	hosts[host].modules = modulemap[host];