Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 6370:3cfbd3f2c658
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Aug 2014 12:23:58 +0100 |
| parents | 0f6399c86c10 |
| children | 3a1c39b31497 79318d548465 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Aug 2014 12:23:58 +0100 |
| parents | 0f6399c86c10 |
| children | 3a1c39b31497 79318d548465 |