# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1548150264 -3600
# Node ID b72d2f4153f7d71778d528861af6ccd53e61e00b
# Parent  7929e0fe05772102e20b2e013afb334407444ef2# Parent  7bfc4269dc36e4f51ceffa9b0b9c71388a693448
Merge 0.11->trunk

diff -r 7929e0fe0577 -r b72d2f4153f7 plugins/mod_websocket.lua