Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 4956:bc26e6d519ae
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | d8b9fe5900a2 |
| children | f19b38bfa015 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | d8b9fe5900a2 |
| children | f19b38bfa015 |