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)
commit41977f3e683e553a2a96b23b467e2ac6b8c3cec3
tree091eaecf0b09384593b90d77a0731cccef478db8
parent92549bf71353be6164c33da3794ac0eda28d4783
parent5cf94a455ef8231f67b252fc06726547f9f66172
Merge 0.9->0.10
core/s2smanager.lua