Mercurial > prosody-modules
diff mod_mam/mod_mam.lua @ 878:6b7a2d1a1879
Merging from upstream
author | Rob Hoelz <rob@hoelz.ro> |
---|---|
date | Mon, 10 Dec 2012 22:37:41 +0100 |
parents | ba2e207e1fb7 |
children | 8a1beff848c1 |
author | Rob Hoelz <rob@hoelz.ro> |
---|---|
date | Mon, 10 Dec 2012 22:37:41 +0100 |
parents | ba2e207e1fb7 |
children | 8a1beff848c1 |