Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 18:43:28 +0200
changeset 7499 98c8d14be4ef
parent 7496 f67b7509ee28 (current diff)
parent 7498 caee8a32983a (diff)
child 7500 22942eda53f8
child 7501 92e1c8355694
Merge 0.9->0.10
core/sessionmanager.lua