Mercurial > prosody-hg
comparison plugins/muc/mod_muc.lua @ 6083:31b2f82e2d3c
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 21:54:44 +0200 |
| parents | 0f6399c86c10 |
| children | 3a1c39b31497 79318d548465 |
comparison
equal
deleted
inserted
replaced
| 6081:19ada596aec4 | 6083:31b2f82e2d3c |
|---|
