# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1468428213 -7200
# Node ID 22942eda53f8cabefb446868d871f21d61d230a0
# Parent  f82356adcd716a12eb3178ba6e395be506efa6cc# Parent  98c8d14be4efbbbaeb20e7bb825ec0fca940f47b
Merge 0.10->trunk

diff -r f82356adcd71 -r 22942eda53f8 core/sessionmanager.lua