Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 21 Jan 2015 01:29:00 +0000 (01:29 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 21 Jan 2015 01:29:00 +0000 (01:29 +0000)
commita030bbf6840a1b0d229b462805561125c34ebdb5
tree9c45d1e6181c72a9a12250079715decdc305dbc5
parentc7816baf0063ef5ded19d7fc37aa72ee0ce56612
parentbef34b738b6ac867a989dc3b9094538cd7558e47
Merge 0.10->trunk
core/hostmanager.lua
core/moduleapi.lua
core/storagemanager.lua