Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 6007:ff24bc2d41a6
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 03 Feb 2014 07:23:33 +0100 |
| parents | 0f6399c86c10 |
| children | 3a1c39b31497 79318d548465 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 03 Feb 2014 07:23:33 +0100 |
| parents | 0f6399c86c10 |
| children | 3a1c39b31497 79318d548465 |