# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1480205183 -3600
# Node ID 0e442402cebc13001c0e18017eb654584a50c7bd
# Parent  6d6a04628954d815b14426b92fbb4d00cd7886f4# Parent  3dff38ffdcd047d35c76ec32df8e97f03948dda9
Merge 0.10->trunk

diff -r 6d6a04628954 -r 0e442402cebc plugins/muc/mod_muc.lua