# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1371121666 -3600
# Node ID 43cc1f95395e0d7def2eb40a5f6526adc228e5ad
# Parent  51f7de1b6bb5698d91c7b8fa3f2faeb8c3b115f6# Parent  24b044f6e06d0ea45e7ab2fc55dd9695e0e1f630
Merge 0.9->trunk

diff -r 51f7de1b6bb5 -r 43cc1f95395e plugins/muc/muc.lib.lua