Merge with 0.5

author Matthew Wild <mwild1@gmail.com>

Mon, 5 Oct 2009 13:42:56 +0000 (14:42 +0100)

committer Matthew Wild <mwild1@gmail.com>

Mon, 5 Oct 2009 13:42:56 +0000 (14:42 +0100)
author Matthew Wild <mwild1@gmail.com>
Mon, 5 Oct 2009 13:42:56 +0000 (14:42 +0100)
committer Matthew Wild <mwild1@gmail.com>
Mon, 5 Oct 2009 13:42:56 +0000 (14:42 +0100)
diff --cc core/modulemanager.lua
Simple merge
diff --cc plugins/mod_console.lua
Simple merge
author	Matthew Wild <mwild1@gmail.com>
	Mon, 5 Oct 2009 13:42:56 +0000 (14:42 +0100)
committer	Matthew Wild <mwild1@gmail.com>
	Mon, 5 Oct 2009 13:42:56 +0000 (14:42 +0100)
		1	2
core/modulemanager.lua	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/mod_console.lua	patch \|	diff1 \|	diff2 \|	blob \| history