Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 2914:9f6fec37d3e2
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 22 Mar 2010 14:38:01 +0000 |
| parents | a3f6cc3417f2 |
| children | fc96d439453b |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 22 Mar 2010 14:38:01 +0000 |
| parents | a3f6cc3417f2 |
| children | fc96d439453b |