Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 4846:3bc3498df0a0
Merge with Maranda
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 11 May 2012 01:53:32 +0100 |
| parents | 875b90d5ce0f |
| children | d8b9fe5900a2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 11 May 2012 01:53:32 +0100 |
| parents | 875b90d5ce0f |
| children | d8b9fe5900a2 |