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