Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 3119:c1ac08fa2533
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 24 May 2010 16:52:12 +0100 |
| parents | 692b3c6c5bd2 |
| children | 330010ef078f |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 24 May 2010 16:52:12 +0100 |
| parents | 692b3c6c5bd2 |
| children | 330010ef078f |