Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Mon, 11 Jan 2016 14:33:18 +0000 (15:33 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 11 Jan 2016 14:33:18 +0000 (15:33 +0100)
1  2 
core/portmanager.lua

Simple merge