Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 4097:2d3866aed062
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 07 Jan 2011 11:59:05 +0000 |
| parents | 84792db89336 |
| children | 813adb81d7da |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 07 Jan 2011 11:59:05 +0000 |
| parents | 84792db89336 |
| children | 813adb81d7da |