# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1526511570 -3600
# Node ID 51375b00723912b8935d6fe9299a5cadd02782d4
# Parent  0e2c1c4d4f78fd95b5c598f0fa577881abd887ef# Parent  aaff40ec700128306b1b843247a098b5d291bb87
Merge 0.10 -> trunk

diff -r 0e2c1c4d4f78 -r 51375b007239 plugins/muc/muc.lib.lua