Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 2896:49db4238ecfd
Merge darkrain->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Mar 2010 01:31:37 +0000 |
| parents | a3f6cc3417f2 |
| children | fc96d439453b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Mar 2010 01:31:37 +0000 |
| parents | a3f6cc3417f2 |
| children | fc96d439453b |