Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 4541:05f5ec99da77
Merge with trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 Jan 2012 22:55:49 +0000 |
| parents | 1cbf3744300c |
| children | 875b90d5ce0f |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 Jan 2012 22:55:49 +0000 |
| parents | 1cbf3744300c |
| children | 875b90d5ce0f |