Mercurial > prosody-modules
comparison mod_mam_adhoc/mod_mam_adhoc.lua @ 831:0c3638673464
Merge upstream with my local LDAP work
author | Rob Hoelz <rob@hoelz.ro> |
---|---|
date | Tue, 18 Sep 2012 00:31:42 +0200 |
parents | 6c7b6a0dcacf |
children | 91d210b6106a |
comparison
equal
deleted
inserted
replaced
830:f160166612c2 | 831:0c3638673464 |
---|