Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 18:43:33 +0200
changeset 7500 22942eda53f8
parent 7497 f82356adcd71 (current diff)
parent 7499 98c8d14be4ef (diff)
child 7508 3d950ee0de35
Merge 0.10->trunk
core/sessionmanager.lua