Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 4200:fb487ee690ea
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 24 Feb 2011 02:04:56 +0000 |
| parents | 813adb81d7da |
| children | 9a8d2baf7a9c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 24 Feb 2011 02:04:56 +0000 |
| parents | 813adb81d7da |
| children | 9a8d2baf7a9c |