Merge 0.10->trunk

author Matthew Wild <mwild1@gmail.com>

Wed, 21 Jan 2015 01:29:00 +0000 (01:29 +0000)

committer Matthew Wild <mwild1@gmail.com>

Wed, 21 Jan 2015 01:29:00 +0000 (01:29 +0000)
author Matthew Wild <mwild1@gmail.com>
Wed, 21 Jan 2015 01:29:00 +0000 (01:29 +0000)
committer Matthew Wild <mwild1@gmail.com>
Wed, 21 Jan 2015 01:29:00 +0000 (01:29 +0000)
diff --cc core/hostmanager.lua
Simple merge
diff --cc core/moduleapi.lua
Simple merge
diff --cc core/storagemanager.lua
Simple merge
author	Matthew Wild <mwild1@gmail.com>
	Wed, 21 Jan 2015 01:29:00 +0000 (01:29 +0000)
committer	Matthew Wild <mwild1@gmail.com>
	Wed, 21 Jan 2015 01:29:00 +0000 (01:29 +0000)
		1	2
core/hostmanager.lua	patch \|	diff1 \|	diff2 \|	blob \| history
core/moduleapi.lua	patch \|	diff1 \|	diff2 \|	blob \| history
core/storagemanager.lua	patch \|	diff1 \|	diff2 \|	blob \| history