Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 3376:529bc6ea24e2
Merge Zash->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 16 Jul 2010 15:10:45 +0100 |
| parents | bdc325ce9fbc |
| children | 02e668d64e05 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 16 Jul 2010 15:10:45 +0100 |
| parents | bdc325ce9fbc |
| children | 02e668d64e05 |