Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 4290:aaa06e68a9e4
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 15:28:41 +0100 |
| parents | 513485a11b85 |
| children | 6c082bf9bf0f |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 15:28:41 +0100 |
| parents | 513485a11b85 |
| children | 6c082bf9bf0f |