# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1512830437 -3600
# Node ID 7269313c132418fb8d705f05943cb8f36a4116dc
# Parent  1a0b76b07b7a0d420de5008a01c4123ba12dc88c# Parent  df970f76c7205ca0bba9f5e1577232a87695f854
Merge 0.10->trunk

diff -r 1a0b76b07b7a -r 7269313c1324 plugins/muc/muc.lib.lua