Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 3521:896ffec79f57
Merge hoelzro->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 15 Oct 2010 18:40:37 +0100 |
| parents | 711eb5bf94b4 |
| children | fb49b63e3fe2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 15 Oct 2010 18:40:37 +0100 |
| parents | 711eb5bf94b4 |
| children | fb49b63e3fe2 |