Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 5945:51ead0aa3a02
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 16 Dec 2013 02:04:16 +0000 |
| parents | 31f14991070b 355f8b59bf1b |
| children | c68e2b11d691 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 16 Dec 2013 02:04:16 +0000 |
| parents | 31f14991070b 355f8b59bf1b |
| children | c68e2b11d691 |