Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 19 May 2015 08:31:12 +0000 (09:31 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 19 May 2015 08:31:12 +0000 (09:31 +0100)
commitc9492b4832d02487e200126d7caea403bc5e06fd
tree862fc332c6f103adc21610404709511f6e976021
parent73c2bf60f712da04770a8330efd79f7dbdf99e43
parent77badd853a3d3c3b8c968b7d62b3bae1fa649405
Merge 0.10->trunk
core/hostmanager.lua