Mercurial > prosody-modules
comparison mod_mam_adhoc/mod_mam_adhoc.lua @ 878:6b7a2d1a1879
Merging from upstream
author | Rob Hoelz <rob@hoelz.ro> |
---|---|
date | Mon, 10 Dec 2012 22:37:41 +0100 |
parents | 6c7b6a0dcacf |
children | 91d210b6106a |
comparison
equal
deleted
inserted
replaced
877:cd2262969d2e | 878:6b7a2d1a1879 |
---|