Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 4245:2494d299d8a2
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 06 Apr 2011 14:48:00 +0100 |
| parents | dff7df4a191b |
| children | 513485a11b85 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 06 Apr 2011 14:48:00 +0100 |
| parents | dff7df4a191b |
| children | 513485a11b85 |