# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1458234283 -3600
# Node ID 30b9433a9f3e46d9e87f54a250c093df6aa0759c
# Parent  29eedc776bbd753f2133b5a0f560d8bee2168e1b# Parent  a7a4169446a046c208fefb2523288d03144da879
Merge 0.10->trunk

diff -r 29eedc776bbd -r 30b9433a9f3e core/sessionmanager.lua
diff -r 29eedc776bbd -r 30b9433a9f3e plugins/mod_bosh.lua
diff -r 29eedc776bbd -r 30b9433a9f3e plugins/mod_c2s.lua