# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1577146918 -3600
# Node ID b6f93babebe80f18c787c92f24f7cc279e7130b4
# Parent  421b2f8369fd32fffef2e54d2243e6b2e36a98ab# Parent  3df4790986964ff8f9a0587bded482eb5d6ed103
Merge 0.11->trunk

diff -r 421b2f8369fd -r b6f93babebe8 plugins/mod_mam/mod_mam.lua
diff -r 421b2f8369fd -r b6f93babebe8 plugins/mod_muc_mam.lua