Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 5861:c3ee62b3bdfe
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 07 Oct 2013 12:56:53 +0200 |
| parents | 16a2bb97c5f5 |
| children | 2d5685c6262f |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 07 Oct 2013 12:56:53 +0200 |
| parents | 16a2bb97c5f5 |
| children | 2d5685c6262f |