Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 4133:71b38dca22c3
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 31 Jan 2011 23:17:11 +0000 |
| parents | 813adb81d7da |
| children | 9a8d2baf7a9c |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 31 Jan 2011 23:17:11 +0000 |
| parents | 813adb81d7da |
| children | 9a8d2baf7a9c |