Mercurial > prosody-modules
diff mod_muc_intercom/mod_muc_intercom.lua @ 931:e20e94d75fe3
Merge (someone needs to remember to pull...)
author | Marco Cirillo <maranda@lightwitch.org> |
---|---|
date | Tue, 12 Mar 2013 19:09:26 +0100 |
parents | 108ac6f16d2d |
children | 9c894b56b4e4 |