Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 4573:09255a10fdfa
Merge Zash with Florob and Maranda
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 24 Feb 2012 16:23:46 +0000 |
| parents | be14f96290a4 |
| children | 875b90d5ce0f |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 24 Feb 2012 16:23:46 +0000 |
| parents | be14f96290a4 |
| children | 875b90d5ce0f |