Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 19 May 2015 14:33:47 +0000 (16:33 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 19 May 2015 14:33:47 +0000 (16:33 +0200)
commit971c4d14eed83f9936c4f3397c5922a7a7c23839
treea8365851f384dad3669a77efb335c2db5aea119d
parent73c2bf60f712da04770a8330efd79f7dbdf99e43
parent7d2c9660a4fed6e618704eeb3c85472c98c181a1
Merge 0.10->trunk
core/hostmanager.lua