Mercurial > prosody-modules
diff mod_muc_intercom/mod_muc_intercom.lua @ 753:9d5731af2c27
Merge with Oliver Gerlich
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Jul 2012 14:29:59 +0100 |
| parents | 108ac6f16d2d |
| children | 9c894b56b4e4 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Jul 2012 14:29:59 +0100 |
| parents | 108ac6f16d2d |
| children | 9c894b56b4e4 |