# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1547930116 -3600
# Node ID b87cd83a26853b8d8ce5c18df35a3bd881e2f47f
# Parent  7259a61bacc8dc7d881aae6ad073da194aed278d# Parent  5c5117d41133e3ac4ce412d6f72157fdeb1f6551
Merge 0.11->trunk

diff -r 7259a61bacc8 -r b87cd83a2685 plugins/mod_websocket.lua