Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Wed, 13 May 2015 22:22:56 +0000 (00:22 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 13 May 2015 22:22:56 +0000 (00:22 +0200)
1  2 
core/s2smanager.lua

Simple merge