Merge 0.9->trunk

author Matthew Wild <mwild1@gmail.com>

Wed, 19 Sep 2012 11:14:08 +0000 (12:14 +0100)

committer Matthew Wild <mwild1@gmail.com>

Wed, 19 Sep 2012 11:14:08 +0000 (12:14 +0100)
author Matthew Wild <mwild1@gmail.com>
Wed, 19 Sep 2012 11:14:08 +0000 (12:14 +0100)
committer Matthew Wild <mwild1@gmail.com>
Wed, 19 Sep 2012 11:14:08 +0000 (12:14 +0100)
diff --cc core/storagemanager.lua
Simple merge
diff --cc plugins/mod_admin_telnet.lua
Simple merge
diff --cc plugins/mod_storage_internal.lua
Simple merge
diff --cc plugins/mod_storage_sql.lua
Simple merge
author	Matthew Wild <mwild1@gmail.com>
	Wed, 19 Sep 2012 11:14:08 +0000 (12:14 +0100)
committer	Matthew Wild <mwild1@gmail.com>
	Wed, 19 Sep 2012 11:14:08 +0000 (12:14 +0100)
		1	2
core/storagemanager.lua	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/mod_admin_telnet.lua	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/mod_storage_internal.lua	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/mod_storage_sql.lua	patch \|	diff1 \|	diff2 \|	blob \| history