Mercurial > prosody-modules
diff mod_mam/mamprefsxml.lib.lua @ 1341:f5c256a5f209
Merge
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 10 Mar 2014 00:04:00 +0100 |
parents | 0d6ab5e4bc30 |
children | 18349533c44d |
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 10 Mar 2014 00:04:00 +0100 |
parents | 0d6ab5e4bc30 |
children | 18349533c44d |