# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1493278710 -7200
# Node ID dea35dfd580864c9412bbc4ffd129076d5118167
# Parent  3f44abfe7264fa7686e5e2299eade8c33b404bbb# Parent  3e97dae282152c15d0f66320656e2df3b4c2f37d
Merge

diff -r 3f44abfe7264 -r dea35dfd5808 mod_mam_archive/mod_mam_archive.lua
--- a/mod_mam_archive/mod_mam_archive.lua	Tue Apr 25 12:02:36 2017 +0100
+++ b/mod_mam_archive/mod_mam_archive.lua	Thu Apr 27 09:38:30 2017 +0200
@@ -5,7 +5,7 @@
 --
 local get_prefs = module:require"mod_mam/mamprefs".get;
 local set_prefs = module:require"mod_mam/mamprefs".set;
-local rsm = module:require "mod_mam/rsm";
+local rsm = require "util.rsm";
 local jid_bare = require "util.jid".bare;
 local jid_prep = require "util.jid".prep;
 local date_parse = require "util.datetime".parse;