# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1440270060 -7200
# Node ID e3c51bf7861b3542cf92ab65e63504e147a58e65
# Parent  8b284787fe267688df516e0f2ac22dab32ee8982# Parent  2bf1b7e2149ad0c3914288c8d70df8f434f74689
Merge 0.10->trunk

diff -r 8b284787fe26 -r e3c51bf7861b plugins/mod_websocket.lua
--- a/plugins/mod_websocket.lua	Thu Aug 20 23:57:22 2015 +0200
+++ b/plugins/mod_websocket.lua	Sat Aug 22 21:01:00 2015 +0200
@@ -13,7 +13,7 @@
 local st = require "util.stanza";
 local parse_xml = require "util.xml".parse;
 local portmanager = require "core.portmanager";
-local sm_destroy_session = sessionmanager.destroy_session;
+local sm_destroy_session = require"core.sessionmanager".destroy_session;
 local log = module._log;
 
 local websocket_frames = require"net.websocket.frames";