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)
1  2 
core/hostmanager.lua

Simple merge